Merge tag 'upstream/3.21.90'

Upstream version 3.21.90

1 files changed, 222 insertions, 300 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3c96501..5d70a59 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,400 +7,310 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-04-06 14:16+1200\n"
+"POT-Creation-Date: 2016-07-29 12:47+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: 2016-04-14 05:40+0000\n"
-"X-Generator: Launchpad (build 17990)\n"
+"X-Launchpad-Export-Date: 2016-07-30 05:46+0000\n"
+"X-Generator: Launchpad (build 18169)\n"
 "Language: zh_CN\n"
 
 #. Button to submit authorization dialog
-#: ../data/simple-scan.ui.h:2
+#: data/simple-scan.ui:24
 msgid "_Authorize"
 msgstr "认证(_A)"
 
 #. Label beside username entry
-#: ../data/simple-scan.ui.h:4
+#: data/simple-scan.ui:102
 msgid "_Username for resource:"
 msgstr "资源用户名(_U)："
 
 #. Label beside password entry
-#: ../data/simple-scan.ui.h:6
+#: data/simple-scan.ui:117
 msgid "_Password:"
 msgstr "密码(_P)："
 
 #. Combo box label for scanning both sides of a page
-#: ../data/simple-scan.ui.h:8
+#: data/simple-scan.ui:188
 msgid "Front and Back"
 msgstr "正面和背面"
 
 #. Combo box label for scanning the front side of a page
-#: ../data/simple-scan.ui.h:10
+#: data/simple-scan.ui:192
 msgid "Front"
 msgstr "正面"
 
 #. Combo box label for scanning the back side of a page
-#: ../data/simple-scan.ui.h:12
+#: data/simple-scan.ui:196
 msgid "Back"
 msgstr "背面"
 
 #. Title of scan window
-#: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1
-#: ../data/appdata/simple-scan.appdata.xml.in.h:1
+#: data/simple-scan.ui:225 data/simple-scan.ui:809
+#: data/simple-scan.desktop.in:3 data/simple-scan.appdata.xml.in:6
 msgid "Simple Scan"
 msgstr "扫描易"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
-#: ../data/simple-scan.ui.h:16
+#: data/simple-scan.ui:241
 msgid "_Document"
 msgstr "文档(_D)"
 
 #. Scan menu item
-#: ../data/simple-scan.ui.h:18
+#: data/simple-scan.ui:260
 msgid "Sc_an"
 msgstr "扫描(_A)"
 
+#. Scan menu item to scan a single page from the scanner
 #. Toolbar scan menu item to scan a single page from the scanner
-#: ../data/simple-scan.ui.h:20
+#: data/simple-scan.ui:273 data/simple-scan.ui:1306 data/simple-scan.ui:1356
 msgid "Single _Page"
 msgstr "单页(_P)"
 
+#. Scan menu item to scan all pages from a document feeder
 #. Toolbar scan menu item to scan all pages from a document feeder
-#: ../data/simple-scan.ui.h:22
+#: data/simple-scan.ui:283 data/simple-scan.ui:1315 data/simple-scan.ui:1365
 msgid "All Pages From _Feeder"
 msgstr "传送来的所有页面(_F)"
 
 #. Menu entry to stop current scan
-#: ../data/simple-scan.ui.h:24
+#: data/simple-scan.ui:294
 msgid "_Stop Scan"
 msgstr "停止扫描(_S)"
 
-#: ../data/simple-scan.ui.h:25
+#: data/simple-scan.ui:310 data/simple-scan.ui:1330 data/simple-scan.ui:1380
 msgid "Text"
 msgstr "文本"
 
-#: ../data/simple-scan.ui.h:26
+#: data/simple-scan.ui:320 data/simple-scan.ui:1340 data/simple-scan.ui:1390
 msgid "Photo"
 msgstr "照片"
 
 #. Menu item to reorder pages
-#. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1183 ../src/ui.vala:1841
+#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "重新排序页面"
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: data/simple-scan.ui:367
 msgid "_Email"
 msgstr "电子邮件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: data/simple-scan.ui:430
 msgid "_Page"
 msgstr "页面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: data/simple-scan.ui:440
 msgid "Rotate _Left"
 msgstr "向左旋转(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: data/simple-scan.ui:450
 msgid "Rotate _Right"
 msgstr "向右旋转(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: data/simple-scan.ui:460
 msgid "_Crop"
 msgstr "剪裁(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: data/simple-scan.ui:470
 msgid "_None"
 msgstr "无(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: data/simple-scan.ui:481
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: data/simple-scan.ui:492
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: data/simple-scan.ui:503
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: data/simple-scan.ui:514
 msgid "_Letter"
 msgstr "信件(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: data/simple-scan.ui:525
 msgid "Le_gal"
 msgstr "法定(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: data/simple-scan.ui:536
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: data/simple-scan.ui:547
 msgid "_Custom"
 msgstr "自定义(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: data/simple-scan.ui:565
 msgid "_Rotate Crop"
 msgstr "旋转剪裁(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: data/simple-scan.ui:578
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: data/simple-scan.ui:587
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: data/simple-scan.ui:624
 msgid "_Help"
 msgstr "帮助(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: data/simple-scan.ui:632
 msgid "_Contents"
 msgstr "内容(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: data/simple-scan.ui:674 data/simple-scan.ui:885
 msgid "Start a new document"
 msgstr "开始一个新的文档"
 
-#: ../data/simple-scan.ui.h:67
+#: data/simple-scan.ui:675
 msgid "New"
 msgstr "新建"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: data/simple-scan.ui:689 data/simple-scan.ui:836
 msgid "Scan a single page from the scanner"
 msgstr "从扫描仪扫描一个单页"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: data/simple-scan.ui:691 data/simple-scan.ui:837
 msgid "Scan"
 msgstr "扫描"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: data/simple-scan.ui:707 data/simple-scan.ui:864
 msgid "Save document to a file"
 msgstr "将文档保存为文件"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1842
+#: data/simple-scan.ui:709 src/ui.vala:1842
 msgid "Save"
 msgstr "保存"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: data/simple-scan.ui:724 data/simple-scan.ui:824
 msgid "Stop the current scan"
 msgstr "停止当前扫描"
 
-#: ../data/simple-scan.ui.h:77
+#: data/simple-scan.ui:725 data/simple-scan.ui:825
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: data/simple-scan.ui:749 data/simple-scan.ui:936
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "左旋页面 (逆时针)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: data/simple-scan.ui:750
 msgid "Rotate Left"
 msgstr "逆时针旋转"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: data/simple-scan.ui:764 data/simple-scan.ui:914
 msgid "Rotate the page to the right (clockwise)"
 msgstr "右旋页面 (顺时针)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: data/simple-scan.ui:765
 msgid "Rotate Right"
 msgstr "顺时针旋转"
 
-#: ../data/simple-scan.ui.h:86
+#: data/simple-scan.ui:779 data/simple-scan.ui:963
 msgid "Crop the selected page"
 msgstr "裁剪选中的页面"
 
-#: ../data/simple-scan.ui.h:87
+#: data/simple-scan.ui:781
 msgid "Crop"
 msgstr "剪裁"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1849
+#: data/simple-scan.ui:997 src/ui.vala:1849
 msgid "Preferences"
 msgstr "首选项"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: data/simple-scan.ui:1048
 msgid "Scan S_ource:"
 msgstr "扫描来源(_O)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: data/simple-scan.ui:1079
 msgid "_Text Resolution:"
 msgstr "文字分辨率(_T)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: data/simple-scan.ui:1095
 msgid "_Photo Resolution:"
 msgstr "图像分辨率(_P)："
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: data/simple-scan.ui:1139
 msgid "Scan Side:"
 msgstr "扫描页面："
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: data/simple-scan.ui:1169
 msgid "Page Size:"
 msgstr "页面大小："
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: data/simple-scan.ui:1199
 msgid "Brightness:"
 msgstr "亮度："
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: data/simple-scan.ui:1229
 msgid "Contrast:"
 msgstr "对比度："
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: data/simple-scan.ui:1260
 msgid "Quality:"
 msgstr "质量："
 
-#: ../data/simple-scan.desktop.in.h:2
+#: data/simple-scan.desktop.in:4
 msgid "Document Scanner"
 msgstr "文档扫描仪"
 
-#: ../data/simple-scan.desktop.in.h:3
+#: data/simple-scan.desktop.in:5
 msgid "Scan Documents"
 msgstr "扫描文档"
 
-#: ../data/simple-scan.desktop.in.h:4
+#: data/simple-scan.desktop.in:6
 msgid "scan;scanner;flatbed;adf;"
 msgstr "scan;scanner;flatbed;adf;扫描;扫描仪;"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
-msgid "Device to scan from"
-msgstr "扫描设备"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
-msgid "SANE device to acquire images from."
-msgstr "从 SANE 设备获取图像。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
-msgid "Type of document being scanned"
-msgstr "扫描文档的类型"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
-msgid ""
-"Type of document being scanned. This setting decides on the scan resolution, "
-"colors and post-processing."
-msgstr "要扫描的文件类型。此设置将决定扫描的分辨率、色彩和预处理。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
-msgid "Width of paper in tenths of a mm"
-msgstr "纸张的宽度 (以 0.1mm 计)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:6
-msgid ""
-"The width of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "纸张的宽度 (以 0.1mm 计，0 代表自动检查纸张)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
-msgid "Height of paper in tenths of a mm"
-msgstr "纸张的高度 (以 0.1mm 计)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
-msgid ""
-"The height of the paper in tenths of a mm (or 0 for automatic paper "
-"detection)."
-msgstr "纸张的高度 (以 0.1mm 计，0 代表自动检查纸张)"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
-msgid "Brightness of scan"
-msgstr "扫描亮度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
-msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr "从 -100 到 100 的亮度调节（0 为不作调节）"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
-msgid "Contrast of scan"
-msgstr "扫描对比度"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
-msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr "从 -100 到 100 的对比度调节（0 为不作调节）"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
-msgid "Resolution for text scans"
-msgstr "文本扫描分辨率"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
-msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "上次扫描文档的分辨率 (点/英寸)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
-msgid "Resolution for photo scans"
-msgstr "照片扫描分辨率"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
-msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "扫描照片时使用的分辨率 (点/英寸)。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
-msgid "Page side to scan"
-msgstr "扫描纸张的哪面"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
-msgid "The page side to scan."
-msgstr "要扫描的页面。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
-msgid "Directory to save files to"
-msgstr "保存文件的文件夹："
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
-msgid ""
-"The directory to save files to. Defaults to the documents directory if unset."
-msgstr "用于保存文件的文件夹。如果不设置，默认使用 文档 文件夹。"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
-msgid "Quality value to use for JPEG compression"
-msgstr "JPEG 压缩质量"
-
-#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
-msgid "Quality value to use for JPEG compression."
-msgstr "JPEG 压缩质量"
+#: data/simple-scan.desktop.in:8
+msgid "scanner"
+msgstr ""
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:2
+#: data/simple-scan.appdata.xml.in:8
 msgid ""
 "A really easy way to scan both documents and photos. You can crop out the "
 "bad parts of a photo and rotate it if it is the wrong way round. You can "
@@ -410,196 +320,162 @@ msgstr ""
 "一个非常简单的方法来同时扫描文档和照片。如果图片显示有误，您可以根据需要通过裁剪、旋转等方式调整照片。您也可以打印扫描件、导出 PDF "
 "格式、或者保存为图片。"
 
-#: ../data/appdata/simple-scan.appdata.xml.in.h:3
+#: data/simple-scan.appdata.xml.in:13
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "扫描易使用 SANE 框架支持大多数现有的扫描仪。"
 
-#. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:841
+#: src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "没有可用的扫描仪。请连接一个扫描仪。"
 
-#. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:871
+#: src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "无法连接到扫描仪"
 
-#. Error display when unable to start scan
-#: ../src/scanner.vala:1223
+#: src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "无法开始扫描"
 
-#. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
+#: src/scanner.vala:1236 src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "与扫描仪通信错误"
 
-#. Help string for command line --version flag
-#: ../src/simple-scan.vala:21
+#: src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "显示版本信息"
 
-#. Help string for command line --debug flag
-#: ../src/simple-scan.vala:24
+#: src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "显示调试信息"
 
-#: ../src/simple-scan.vala:26
+#: src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "修复旧版扫描易生成的 PDF 文件"
 
-#. Title of error dialog when scan failed
-#: ../src/simple-scan.vala:391
+#: src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "扫描失败"
 
-#. Arguments and description for --help text
-#: ../src/simple-scan.vala:621
+#: src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[设备...] - 扫描工具"
 
-#. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:632
+#: src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
 
-#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
+#: 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:327
+#: 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:375
+#: src/ui.vala:375
 msgid "No scanners detected"
 msgstr "没有发现扫描仪"
 
-#. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:377
+#: 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:382
+#: src/ui.vala:382
 msgid "Additional software needed"
 msgstr "需要安装其他软件"
 
-#. Instructions to install driver software
-#: ../src/ui.vala:384
+#: src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "您需要为扫描仪安装驱动程序。"
 
-#. Save dialog: Dialog title
-#: ../src/ui.vala:506 ../src/ui.vala:1843
+#: src/ui.vala:506 src/ui.vala:1843
 msgid "Save As..."
 msgstr "保存为..."
 
-#: ../src/ui.vala:509 ../src/ui.vala:675
+#: src/ui.vala:509 src/ui.vala:675
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ui.vala:510 ../src/ui.vala:676
+#: src/ui.vala:510 src/ui.vala:676
 msgid "_Save"
 msgstr "保存(_S)"
 
-#. Default filename to use when saving document
-#: ../src/ui.vala:516
+#: src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"
 
-#. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:521
+#: src/ui.vala:521
 msgid "Image Files"
 msgstr "图像文件"
 
-#. Save dialog: Filter name to show all files
-#: ../src/ui.vala:527
+#: src/ui.vala:527
 msgid "All Files"
 msgstr "所有文件"
 
-#. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:536
+#: src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (多页文档)"
 
-#. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:542
+#: src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (压缩)"
 
-#. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:548
+#: 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:557
+#: src/ui.vala:557
 msgid "File format:"
 msgstr "文件格式："
 
-#. Title of error dialog when save failed
-#: ../src/ui.vala:650
+#: 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:673
+#: 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:708
+#: src/ui.vala:708
 msgid "Save current document?"
 msgstr "保存当前文档？"
 
-#. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:710
+#: src/ui.vala:710
 msgid "Discard Changes"
 msgstr "放弃更改"
 
-#. Error message display when unable to save image for preview
-#: ../src/ui.vala:992
+#: src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "无法保存用以预览的图像"
 
-#. Error message display when unable to preview image
-#: ../src/ui.vala:1004
+#: src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "无法打开图像预览软件"
 
-#. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1206
+#: src/ui.vala:1206
 msgid "Combine sides"
 msgstr "合并页"
 
-#. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1216
+#: src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "合并页(反向)"
 
-#. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1226
+#: src/ui.vala:1226
 msgid "Reverse"
 msgstr "反向"
 
-#. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1236
+#: src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "保持不变"
 
-#. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1451
+#: src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
-#. The license this software is under (GPL3+)
-#: ../src/ui.vala:1472
+#: 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"
@@ -624,24 +500,21 @@ msgstr ""
 "您应已收到附随于本程序的 GNU 通用公共授权的副本；如果没有，请参照\n"
 "<http://www.gnu.org/licenses/>."
 
-#. Title of about dialog
-#: ../src/ui.vala:1475
+#: src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
-#. Description of program
-#: ../src/ui.vala:1478
+#: src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: ../src/ui.vala:1487
+#: src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Alexey Kotlyarov https://launchpad.net/~koterpillar\n"
 "  Aron Xu https://launchpad.net/~happyaron\n"
 "  Carlos Gong https://launchpad.net/~bfsugxy\n"
-"  David Gao https://launchpad.net/~davidgao1001\n"
 "  Dennis Kuang https://launchpad.net/~denniskrq\n"
 "  Dingyuan Wang https://launchpad.net/~gumblex\n"
 "  Heling Yao https://launchpad.net/~hyao\n"
@@ -650,197 +523,173 @@ msgstr ""
 "  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:1509
+#: src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "退出前保存文档？"
 
-#. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1511
+#: src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "退出且不保存"
 
-#. Message to indicate a Brother scanner has been detected
-#: ../src/ui.vala:1579
+#: src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "您似乎有一个 Brother 扫描仪。"
 
-#. Instructions on how to install Brother scanner drivers
-#: ../src/ui.vala:1581
+#: src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr "该驱动程序可在 <a href=\"http://support.brother.com\">兄弟网站</a>获得。"
 
-#. Message to indicate a Samsung scanner has been detected
-#: ../src/ui.vala:1585
+#: src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "您似乎有一个 Samsung 扫描仪。"
 
-#. Instructions on how to install Samsung scanner drivers
-#: ../src/ui.vala:1587
+#: src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr "该驱动程序可在<a href=\"http://samsung.com/support\">三星网站</a>获得。"
 
-#. Message to indicate a HP scanner has been detected
-#: ../src/ui.vala:1591
+#: src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "您似乎有一个 HP 扫描仪。"
 
-#. Message to indicate an Epson scanner has been detected
-#: ../src/ui.vala:1596
+#: src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "您似乎有一个 Epson 扫描仪。"
 
-#. Instructions on how to install Epson scanner drivers
-#: ../src/ui.vala:1598
+#: src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr "该驱动程序可在<a href=\"http://support.epson.com\">爱普生网站</a>获得。"
 
-#. Title of dialog giving instructions on how to install drivers
-#: ../src/ui.vala:1602
+#: src/ui.vala:1602
 msgid "Install drivers"
 msgstr "安装驱动"
 
-#. Message in driver install dialog
-#: ../src/ui.vala:1633
+#: src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "安装完成后，需要重新启动扫描易。"
 
-#. Label shown while installing drivers
-#: ../src/ui.vala:1645
+#: src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "安装驱动程序…"
 
-#. Label shown once drivers successfully installed
-#: ../src/ui.vala:1653
+#: src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "成功安装驱动程序！"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1663
+#: src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "无法安装驱动程序(错误码 %d)。"
 
-#. Label shown if failed to install drivers
-#: ../src/ui.vala:1669
+#: src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "安装驱动失败。"
 
-#. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/ui.vala:1676
+#: src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "您需要安装 %s 包。"
 
-#. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1784
+#: 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:1787
+#: 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:1790
+#: 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:1793
+#: src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1835
+#: src/ui.vala:1835
 msgid "New Document"
 msgstr "新文档"
 
-#: ../src/ui.vala:1840
+#: src/ui.vala:1840
 msgid "Document"
 msgstr "文档"
 
-#: ../src/ui.vala:1844
+#: src/ui.vala:1844
 msgid "Email..."
 msgstr "电子邮件..."
 
-#: ../src/ui.vala:1845
+#: src/ui.vala:1845
 msgid "Print..."
 msgstr "打印..."
 
-#: ../src/ui.vala:1853
+#: src/ui.vala:1853
 msgid "Help"
 msgstr "帮助"
 
-#: ../src/ui.vala:1854
+#: src/ui.vala:1854
 msgid "About"
 msgstr "关于"
 
-#: ../src/ui.vala:1855
+#: src/ui.vala:1855
 msgid "Quit"
 msgstr "退出"
 
-#. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1889
+#: src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "更换扫描仪(_S)"
 
-#. Button in error infobar to prompt user to install drivers
-#: ../src/ui.vala:1891
+#: src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "安装驱动(_I)"
 
-#. Combo box value for automatic paper size
-#: ../src/ui.vala:1897
+#: src/ui.vala:1897
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/ui.vala:1947
+#: src/ui.vala:1947
 msgid "Darker"
 msgstr "较深"
 
-#: ../src/ui.vala:1949
+#: src/ui.vala:1949
 msgid "Lighter"
 msgstr "稍浅"
 
-#: ../src/ui.vala:1957
+#: src/ui.vala:1957
 msgid "Less"
 msgstr "较少"
 
-#: ../src/ui.vala:1959
+#: src/ui.vala:1959
 msgid "More"
 msgstr "更多"
 
-#: ../src/ui.vala:1967
+#: src/ui.vala:1967
 msgid "Minimum"
 msgstr "最小值"
 
-#: ../src/ui.vala:1969
+#: src/ui.vala:1969
 msgid "Maximum"
 msgstr "最大值"
 
-#: ../src/ui.vala:2008
+#: src/ui.vala:2008
 msgid "Saving document..."
 msgstr "正在保存文档..."
 
-#: ../src/ui.vala:2173
+#: src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在保存 %d/%d 页"
@@ -882,6 +731,9 @@ msgstr "正在保存 %d/%d 页"
 #~ "  --gtk-module=MODULES  加载额外的 GTK+ 模块\n"
 #~ "  --g-fatal-warnings  将所有警告置为致命"
 
+#~ msgid "Device to scan from"
+#~ msgstr "扫描设备"
+
 #~ msgid "Direction of scan"
 #~ msgstr "扫描方向"
 
@@ -890,6 +742,9 @@ msgstr "正在保存 %d/%d 页"
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
 #~ msgstr "扫描仪扫描页面的方式。可以是如下几种：顶部到底部、底部到顶部、左边到右边，右边到左边"
 
+#~ msgid "Type of document being scanned"
+#~ msgstr "扫描文档的类型"
+
 #~ msgid ""
 #~ "Type of document being scanned. 'text' for text documents, 'photo' for "
 #~ "photos. This setting decides on the scan resolution, colors and post-"
@@ -918,12 +773,21 @@ msgstr "正在保存 %d/%d 页"
 #~ msgid "Select File _Type"
 #~ msgstr "选择文件类型(_T)"
 
+#~ msgid "Resolution for text scans"
+#~ msgstr "文本扫描分辨率"
+
+#~ msgid "Resolution for photo scans"
+#~ msgstr "照片扫描分辨率"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "上次扫描图片的分辨率 (点/英寸)。"
 
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "上次扫描的图片分辨率"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning text."
+#~ msgstr "上次扫描文档的分辨率 (点/英寸)。"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "所扫描图像的的高度 (以像素计)"
 
@@ -937,12 +801,25 @@ msgstr "正在保存 %d/%d 页"
 #~ "last scanned page was."
 #~ msgstr "所扫描图像的高度 (以像素计)。这是上次扫描的页面的值。"
 
+#~ msgid "SANE device to acquire images from."
+#~ msgstr "从 SANE 设备获取图像。"
+
+#~ msgid ""
+#~ "The directory to save files to. Defaults to the documents directory if unset."
+#~ msgstr "用于保存文件的文件夹。如果不设置，默认使用 文档 文件夹。"
+
+#~ msgid "Directory to save files to"
+#~ msgstr "保存文件的文件夹："
+
 #~ msgid "Window height in pixels"
 #~ msgstr "窗口高度 (像素)"
 
 #~ msgid "Window width in pixels"
 #~ msgstr "窗口宽度 (像素)"
 
+#~ msgid "The resolution in dots-per-inch to use when scanning photos."
+#~ msgstr "扫描照片时使用的分辨率 (点/英寸)。"
+
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "所扫描图像的宽度 (以像素计)。"
 
@@ -953,5 +830,50 @@ msgstr "正在保存 %d/%d 页"
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "扫描纸张的哪面。可以是以下值：“正面” “背面” “均扫描”"
 
+#~ msgid ""
+#~ "The width of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "纸张的宽度 (以 0.1mm 计，0 代表自动检查纸张)"
+
+#~ msgid "Page side to scan"
+#~ msgstr "扫描纸张的哪面"
+
+#~ msgid ""
+#~ "The height of the paper in tenths of a mm (or 0 for automatic paper "
+#~ "detection)."
+#~ msgstr "纸张的高度 (以 0.1mm 计，0 代表自动检查纸张)"
+
+#~ msgid "Height of paper in tenths of a mm"
+#~ msgstr "纸张的高度 (以 0.1mm 计)"
+
+#~ msgid "Width of paper in tenths of a mm"
+#~ msgstr "纸张的宽度 (以 0.1mm 计)"
+
+#~ msgid "The page side to scan."
+#~ msgstr "要扫描的页面。"
+
+#~ msgid ""
+#~ "Type of document being scanned. This setting decides on the scan resolution, "
+#~ "colors and post-processing."
+#~ msgstr "要扫描的文件类型。此设置将决定扫描的分辨率、色彩和预处理。"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "扫描仪相对于被扫描页面的方向。"
+
+#~ msgid "Quality value to use for JPEG compression."
+#~ msgstr "JPEG 压缩质量"
+
+#~ msgid "Contrast of scan"
+#~ msgstr "扫描对比度"
+
+#~ msgid "Brightness of scan"
+#~ msgstr "扫描亮度"
+
+#~ msgid "Quality value to use for JPEG compression"
+#~ msgstr "JPEG 压缩质量"
+
+#~ msgid "The contrast adjustment from -100 to 100 (0 being none)."
+#~ msgstr "从 -100 到 100 的对比度调节（0 为不作调节）"
+
+#~ msgid "The brightness adjustment from -100 to 100 (0 being none)."
+#~ msgstr "从 -100 到 100 的亮度调节（0 为不作调节）"