Merge tag 'upstream/3.21.1'

Upstream version 3.21.1

1 files changed, 114 insertions, 108 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e435714..3c96501 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,15 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-11-27 09:10+1300\n"
+"POT-Creation-Date: 2016-04-06 14:16+1200\n"
 "PO-Revision-Date: 2012-09-20 08:05+0000\n"
 "Last-Translator: Dennis Kuang <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-12-22 04:39+0000\n"
-"X-Generator: Launchpad (build 17865)\n"
+"X-Launchpad-Export-Date: 2016-04-14 05:40+0000\n"
+"X-Generator: Launchpad (build 17990)\n"
+"Language: zh_CN\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -88,9 +89,9 @@ msgstr "照片"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1182 ../src/ui.vala:1832
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
-msgstr ""
+msgstr "重新排序页面"
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
@@ -206,7 +207,7 @@ msgstr "扫描"
 msgid "Save document to a file"
 msgstr "将文档保存为文件"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1833
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
 msgid "Save"
 msgstr "保存"
 
@@ -248,7 +249,7 @@ msgid "Crop"
 msgstr "剪裁"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1840
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "首选项"
 
@@ -294,7 +295,7 @@ msgstr "质量："
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "文档扫描仪"
 
 #: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
@@ -302,7 +303,7 @@ msgstr "扫描文档"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+msgstr "scan;scanner;flatbed;adf;扫描;扫描仪;"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
@@ -406,11 +407,13 @@ msgid ""
 "print your scans, export them to pdf, or save them in a range of image "
 "formats."
 msgstr ""
+"一个非常简单的方法来同时扫描文档和照片。如果图片显示有误，您可以根据需要通过裁剪、旋转等方式调整照片。您也可以打印扫描件、导出 PDF "
+"格式、或者保存为图片。"
 
 #: ../data/appdata/simple-scan.appdata.xml.in.h:3
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
-msgstr ""
+msgstr "扫描易使用 SANE 框架支持大多数现有的扫描仪。"
 
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:841
@@ -462,141 +465,141 @@ msgstr "[设备...] - 扫描工具"
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
 
-#: ../src/ui.vala:317 ../src/ui.vala:1603 ../src/ui.vala:1878
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "关闭(_C)"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:326
+#: ../src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "使用“%s”需要用户名和密码"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:374
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "没有发现扫描仪"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:376
+#: ../src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "请检查您的扫描仪已经连接并且打开"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/ui.vala:381
+#: ../src/ui.vala:382
 msgid "Additional software needed"
-msgstr ""
+msgstr "需要安装其他软件"
 
 #. Instructions to install driver software
-#: ../src/ui.vala:383
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "您需要为扫描仪安装驱动程序。"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:505 ../src/ui.vala:1834
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "保存为..."
 
-#: ../src/ui.vala:508 ../src/ui.vala:674
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. Default filename to use when saving document
-#: ../src/ui.vala:515
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:520
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "图像文件"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:526
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "所有文件"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:535
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (多页文档)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:541
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (压缩)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:547
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (无损)"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
-#: ../src/ui.vala:556
+#: ../src/ui.vala:557
 msgid "File format:"
-msgstr ""
+msgstr "文件格式："
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:649
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "保存文件错误"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:672
+#: ../src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "如果您不保存，变更将永久丢失。"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:707
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "保存当前文档？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:709
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "放弃更改"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:991
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "无法保存用以预览的图像"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1003
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "无法打开图像预览软件"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1205
+#: ../src/ui.vala:1206
 msgid "Combine sides"
-msgstr ""
+msgstr "合并页"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1215
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "合并页(反向)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1226
 msgid "Reverse"
-msgstr ""
+msgstr "反向"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1235
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
-msgstr ""
+msgstr "保持不变"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1450
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1471
+#: ../src/ui.vala:1472
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -622,16 +625,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1474
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
 #. Description of program
-#: ../src/ui.vala:1477
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: ../src/ui.vala:1486
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -643,198 +646,201 @@ msgstr ""
 "  Dingyuan Wang https://launchpad.net/~gumblex\n"
 "  Heling Yao https://launchpad.net/~hyao\n"
 "  Jimhu https://launchpad.net/~huyiwei\n"
+"  MR.wangmaoxin https://launchpad.net/~ddllkl\n"
 "  Wang Dianjin https://launchpad.net/~tuhaihe\n"
 "  Wylmer Wang https://launchpad.net/~wantinghard\n"
 "  Xhacker Liu https://launchpad.net/~xhacker\n"
 "  YunJian https://launchpad.net/~tld5yj\n"
 "  YunQiang Su https://launchpad.net/~wzssyqa\n"
 "  ZhangCheng https://launchpad.net/~xxzc\n"
+"  otm123 https://launchpad.net/~otm123\n"
+"  shijing https://launchpad.net/~shijing\n"
 "  zixue.liu https://launchpad.net/~zixue"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1508
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "退出前保存文档？"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1510
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "退出且不保存"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1580
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "您似乎有一个 Brother 扫描仪。"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1582
+#: ../src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
-msgstr ""
+msgstr "该驱动程序可在 <a href=\"http://support.brother.com\">兄弟网站</a>获得。"
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1586
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "您似乎有一个 Samsung 扫描仪。"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1588
+#: ../src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
-msgstr ""
+msgstr "该驱动程序可在<a href=\"http://samsung.com/support\">三星网站</a>获得。"
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1592
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "您似乎有一个 HP 扫描仪。"
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "您似乎有一个 Epson 扫描仪。"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
-msgstr ""
+msgstr "该驱动程序可在<a href=\"http://support.epson.com\">爱普生网站</a>获得。"
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1603
+#: ../src/ui.vala:1602
 msgid "Install drivers"
-msgstr ""
+msgstr "安装驱动"
 
 #. Message in driver install dialog
-#: ../src/ui.vala:1634
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
-msgstr ""
+msgstr "安装完成后，需要重新启动扫描易。"
 
 #. Label shown while installing drivers
-#: ../src/ui.vala:1646
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
-msgstr ""
+msgstr "安装驱动程序…"
 
 #. Label shown once drivers successfully installed
-#: ../src/ui.vala:1654
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "成功安装驱动程序！"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1664
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "无法安装驱动程序(错误码 %d)。"
 
 #. Label shown if failed to install drivers
-#: ../src/ui.vala:1670
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
-msgstr ""
+msgstr "安装驱动失败。"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1677
+#: ../src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
-msgstr ""
+msgstr "您需要安装 %s 包。"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1775
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (默认)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1778
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1781
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高分辨率)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1784
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1835
 msgid "New Document"
-msgstr ""
+msgstr "新文档"
 
-#: ../src/ui.vala:1831
+#: ../src/ui.vala:1840
 msgid "Document"
-msgstr ""
+msgstr "文档"
 
-#: ../src/ui.vala:1835
+#: ../src/ui.vala:1844
 msgid "Email..."
-msgstr ""
+msgstr "电子邮件..."
 
-#: ../src/ui.vala:1836
+#: ../src/ui.vala:1845
 msgid "Print..."
-msgstr ""
+msgstr "打印..."
 
-#: ../src/ui.vala:1844
+#: ../src/ui.vala:1853
 msgid "Help"
-msgstr ""
+msgstr "帮助"
 
-#: ../src/ui.vala:1845
+#: ../src/ui.vala:1854
 msgid "About"
-msgstr ""
+msgstr "关于"
 
-#: ../src/ui.vala:1846
+#: ../src/ui.vala:1855
 msgid "Quit"
-msgstr ""
+msgstr "退出"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1880
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "更换扫描仪(_S)"
 
 #. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1882
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
-msgstr ""
+msgstr "安装驱动(_I)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1888
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/ui.vala:1938
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "较深"
 
-#: ../src/ui.vala:1940
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "稍浅"
 
-#: ../src/ui.vala:1948
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "较少"
 
-#: ../src/ui.vala:1950
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "更多"
 
-#: ../src/ui.vala:1958
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "最小值"
 
-#: ../src/ui.vala:1960
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "最大值"
 
-#: ../src/ui.vala:1994
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "正在保存文档..."
 
-#: ../src/ui.vala:2157
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在保存 %d/%d 页"