Merge tag 'upstream/3.17.1.1'

Upstream version 3.17.1.1

1 files changed, 27 insertions, 28 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4d33225..58e4cff 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.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: 2015-04-16 05:14+0000\n"
-"X-Generator: Launchpad (build 17428)\n"
+"X-Launchpad-Export-Date: 2015-05-05 05:30+0000\n"
+"X-Generator: Launchpad (build 17474)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -49,7 +49,6 @@ msgstr "背面"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/simple-scan.appdata.xml.in.h:1
 msgid "Simple Scan"
 msgstr "扫描易"
 
@@ -88,7 +87,7 @@ msgstr "照片"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1693
 msgid "Reorder Pages"
 msgstr ""
 
@@ -206,7 +205,7 @@ msgstr "扫描"
 msgid "Save document to a file"
 msgstr "将文档保存为文件"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1694
 msgid "Save"
 msgstr "保存"
 
@@ -248,7 +247,7 @@ msgid "Crop"
 msgstr "剪裁"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1701
 msgid "Preferences"
 msgstr "首选项"
 
@@ -296,7 +295,7 @@ msgstr "质量："
 msgid "Document Scanner"
 msgstr ""
 
-#: ../data/simple-scan.desktop.in.h:3
+#: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
 msgstr "扫描文档"
 
@@ -457,12 +456,12 @@ msgid "Scanned Document"
 msgstr "扫描的文档"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:541
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[设备...] - 扫描工具"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:552
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
@@ -471,7 +470,7 @@ msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1735
+#: ../src/ui.vala:316 ../src/ui.vala:1745
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -492,7 +491,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "请检查您的扫描仪已经连接并且打开"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1691
+#: ../src/ui.vala:507 ../src/ui.vala:1695
 msgid "Save As..."
 msgstr "保存为..."
 
@@ -679,73 +678,73 @@ msgstr "%d dpi (高分辨率)"
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1683
+#: ../src/ui.vala:1687
 msgid "New Document"
 msgstr ""
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1692
 msgid "Document"
 msgstr ""
 
-#: ../src/ui.vala:1692
+#: ../src/ui.vala:1696
 msgid "Email..."
 msgstr ""
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1697
 msgid "Print..."
 msgstr ""
 
-#: ../src/ui.vala:1701
+#: ../src/ui.vala:1705
 msgid "Help"
 msgstr ""
 
-#: ../src/ui.vala:1702
+#: ../src/ui.vala:1706
 msgid "About"
 msgstr ""
 
-#: ../src/ui.vala:1703
+#: ../src/ui.vala:1707
 msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1737
+#: ../src/ui.vala:1747
 msgid "Change _Scanner"
 msgstr "更换扫描仪(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1743
+#: ../src/ui.vala:1753
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/ui.vala:1793
+#: ../src/ui.vala:1803
 msgid "Darker"
 msgstr "较深"
 
-#: ../src/ui.vala:1795
+#: ../src/ui.vala:1805
 msgid "Lighter"
 msgstr "稍浅"
 
-#: ../src/ui.vala:1803
+#: ../src/ui.vala:1813
 msgid "Less"
 msgstr "较少"
 
-#: ../src/ui.vala:1805
+#: ../src/ui.vala:1815
 msgid "More"
 msgstr "更多"
 
-#: ../src/ui.vala:1813
+#: ../src/ui.vala:1823
 msgid "Minimum"
 msgstr "最小值"
 
-#: ../src/ui.vala:1815
+#: ../src/ui.vala:1825
 msgid "Maximum"
 msgstr "最大值"
 
-#: ../src/ui.vala:1856
+#: ../src/ui.vala:1866
 msgid "Saving document..."
 msgstr "正在保存文档..."
 
-#: ../src/ui.vala:2019
+#: ../src/ui.vala:2016
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在保存 %d/%d 页"