Merge tag 'upstream/3.15.1'

Upstream version 3.15.1

1 files changed, 6 insertions, 6 deletions

diff --git a/po/km.po b/po/km.po
index 1dc9517..5b73458 100644
--- a/po/km.po
+++ b/po/km.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-19 06:31+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-09-23 06:40+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -89,7 +89,7 @@ msgstr "រូបថត"
 #. Title of dialog to reorder pages
 #: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
 msgid "Reorder Pages"
-msgstr ""
+msgstr "ការរៀបចំទំព័រ"
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
@@ -560,12 +560,12 @@ msgstr "មិន​អាច​បើក​កម្មវិធី​មើល
 #. Label on button for combining sides in reordering dialog
 #: ../src/ui.vala:1204
 msgid "Combine sides"
-msgstr ""
+msgstr "ផ្សំភាគី"
 
 #. Label on button for combining sides in reverse order in reordering dialog
 #: ../src/ui.vala:1214
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "ផ្សំភាគី (បញ្ច្រាស)"
 
 #. Label on button for reversing in reordering dialog
 #: ../src/ui.vala:1224
@@ -626,9 +626,9 @@ msgstr "ឧបករណ៍​ស្កេន​ធម្មតា"
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  KL https://launchpad.net/~sumoisrock\n"
 "  Khoem Sokhem https://launchpad.net/~khoemsokhem\n"
 "  Noy Shoung https://launchpad.net/~noyshoung\n"
+"  Rockworld https://launchpad.net/~rockrock2222222\n"
 "  Seng Sutha https://launchpad.net/~sutha"
 
 #. Text in dialog warning when a document is about to be lost