Merge branch 'release/3.28.1-1'3.28.1-1

1 files changed, 530 insertions, 387 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 954864b..6bcf67f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-21 20:32+0800\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=simple-scan&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-30 07:44+0000\n"
 "PO-Revision-Date: 2017-09-02 01:35+0800\n"
 "Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
@@ -19,287 +20,495 @@ msgstr ""
 "X-Generator: Poedit 2.0.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:1
+#: data/org.gnome.SimpleScan.gschema.xml:11
 msgid "Device to scan from"
 msgstr "扫描设备"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:2
+#: data/org.gnome.SimpleScan.gschema.xml:12
 msgid "SANE device to acquire images from."
 msgstr "从 SANE 设备获取图像。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:3
+#: data/org.gnome.SimpleScan.gschema.xml:20
 msgid "Type of document being scanned"
 msgstr "扫描文档的类型"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:4
+#: data/org.gnome.SimpleScan.gschema.xml:21
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr "要扫描的文件类型。此设置将决定扫描的分辨率、色彩和预处理。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:5
+#: data/org.gnome.SimpleScan.gschema.xml:25
 msgid "Width of paper in tenths of a mm"
 msgstr "纸张的宽度 (以 0.1mm 计)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:6
+#: data/org.gnome.SimpleScan.gschema.xml:26
 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.h:7
+#: data/org.gnome.SimpleScan.gschema.xml:30
 msgid "Height of paper in tenths of a mm"
 msgstr "纸张的高度 (以 0.1mm 计)"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:8
+#: data/org.gnome.SimpleScan.gschema.xml:31
 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.h:9
+#: data/org.gnome.SimpleScan.gschema.xml:35
 msgid "Brightness of scan"
 msgstr "扫描亮度"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:10
+#: data/org.gnome.SimpleScan.gschema.xml:36
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
 msgstr "从 -100 到 100 的亮度调节（0 为不作调节）"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:11
+#: data/org.gnome.SimpleScan.gschema.xml:40
 msgid "Contrast of scan"
 msgstr "扫描对比度"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:12
+#: data/org.gnome.SimpleScan.gschema.xml:41
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
 msgstr "从 -100 到 100 的对比度调节（0 为不作调节）"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:13
+#: data/org.gnome.SimpleScan.gschema.xml:45
 msgid "Resolution for text scans"
 msgstr "文本扫描分辨率"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:14
+#: data/org.gnome.SimpleScan.gschema.xml:46
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr "上次扫描文档的分辨率 (点/英寸)。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:15
+#: data/org.gnome.SimpleScan.gschema.xml:50
 msgid "Resolution for photo scans"
 msgstr "照片扫描分辨率"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:16
+#: data/org.gnome.SimpleScan.gschema.xml:51
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr "扫描照片时使用的分辨率 (点/英寸)。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:17
+#: data/org.gnome.SimpleScan.gschema.xml:55
 msgid "Page side to scan"
 msgstr "扫描纸张的哪面"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:18
+#: data/org.gnome.SimpleScan.gschema.xml:56
 msgid "The page side to scan."
 msgstr "要扫描的页面。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:19
+#: data/org.gnome.SimpleScan.gschema.xml:60
 msgid "Directory to save files to"
 msgstr "保存文件的文件夹："
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:20
+#: data/org.gnome.SimpleScan.gschema.xml:61
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr "用于保存文件的文件夹。如果不设置，默认使用 文档 文件夹。"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:21
+#: data/org.gnome.SimpleScan.gschema.xml:66
 msgid "Quality value to use for JPEG compression"
 msgstr "JPEG 压缩质量"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:22
+#: data/org.gnome.SimpleScan.gschema.xml:67
 msgid "Quality value to use for JPEG compression."
 msgstr "JPEG 压缩质量"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:23
+#: data/org.gnome.SimpleScan.gschema.xml:72
 msgid "Delay in millisecond between pages"
 msgstr "每页间延迟的毫秒数"
 
-#: ../data/org.gnome.SimpleScan.gschema.xml.h:24
+#: data/org.gnome.SimpleScan.gschema.xml:73
 msgid "Delay in millisecond between pages."
 msgstr "每页间延迟的毫秒数。"
 
-#: ../src/app-window.vala:237 ../src/app-window.vala:1380
+#. Title of scan window
+#. Set HeaderBar title here because Glade doesn't keep it translated
+#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
+#. Title of scan window
+#: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
+#: src/app-window.ui:76 src/app-window.vala:1560
+msgid "Simple Scan"
+msgstr "扫描易"
+
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+msgid "Scan Documents"
+msgstr "扫描文档"
+
+#: data/simple-scan.appdata.xml.in:9
+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 "
+"print your scans, export them to pdf, or save them in a range of image "
+"formats."
+msgstr ""
+"简单的文档和照片扫描软件。如果图片显示有误，您可以根据需要通过裁剪、旋转等方"
+"式调整照片。您也可以打印扫描件、导出 PDF 格式、或者保存为图片。"
+
+#: data/simple-scan.appdata.xml.in:14
+msgid "Simple Scan uses the SANE framework to support most existing scanners."
+msgstr "扫描易使用 SANE 框架支持大多数现有的扫描仪。"
+
+#: data/simple-scan.desktop.in:4
+msgid "Document Scanner"
+msgstr "文档扫描仪"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: data/simple-scan.desktop.in:7
+msgid "scan;scanner;flatbed;adf;"
+msgstr "scan;scanner;flatbed;adf;扫描;扫描仪;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/simple-scan.desktop.in:10
+msgid "scanner"
+msgstr "scanner"
+
+#. Toolbar scan menu item to scan a single page from the scanner
+#. Scan menu item to scan a single page from the scanner
+#. Toolbar scan menu item to scan a single page from the scanner
+#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820
+msgid "Single _Page"
+msgstr "单页(_P)"
+
+#. Toolbar scan menu item to scan all pages from a document feeder
+#. Scan menu item to scan all pages from a document feeder
+#. Toolbar scan menu item to scan all pages from a document feeder
+#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829
+msgid "All Pages From _Feeder"
+msgstr "传送来的所有页面(_F)"
+
+#. Toolbar scan menu item to scan continuously from the flatbed
+#. Scan menu item to scan continuously from the flatbed
+#. Toolbar scan menu item to scan continuously from the flatbed
+#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838
+msgid "_Multiple Pages From Flatbed"
+msgstr "来自扫描床的多个页面(_M)"
+
+#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853
+msgid "Text"
+msgstr "文本"
+
+#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863
+msgid "Photo"
+msgstr "照片"
+
+#. Label on document menu (contains actions for this document, e.g. save, print)
+#: src/app-window.ui:91
+msgid "_Document"
+msgstr "文档(_D)"
+
+#. Scan menu item
+#: src/app-window.ui:110
+msgid "Sc_an"
+msgstr "扫描(_A)"
+
+#. Menu entry to stop current scan
+#: src/app-window.ui:154
+msgid "_Stop Scan"
+msgstr "停止扫描(_S)"
+
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590
+msgid "Reorder Pages"
+msgstr "重新排序页面"
+
+#. Label on email menu item
+#: src/app-window.ui:215
+msgid "_Email"
+msgstr "电子邮件(_E)"
+
+#. Page menu (contains action for each page, e.g. delete, crop)
+#: src/app-window.ui:280
+msgid "_Page"
+msgstr "页面(_P)"
+
+#. Menu item to rotate page to left (anti-clockwise)
+#: src/app-window.ui:290
+msgid "Rotate _Left"
+msgstr "向左旋转(_L)"
+
+#. Menu item to rotate page to right (clockwise)
+#: src/app-window.ui:300
+msgid "Rotate _Right"
+msgstr "向右旋转(_R)"
+
+#. Label for page crop submenu
+#: src/app-window.ui:310
+msgid "_Crop"
+msgstr "剪裁(_C)"
+
+#. Radio button for no crop
+#: src/app-window.ui:320
+msgid "_None"
+msgstr "无(_N)"
+
+#. Radio button for cropping page to A4 size
+#: src/app-window.ui:331
+msgid "A_4"
+msgstr "A_4"
+
+#. Radio button for cropping page to A5 size
+#: src/app-window.ui:342
+msgid "A_5"
+msgstr "A_5"
+
+#. Radio button for cropping page to A6 size
+#: src/app-window.ui:353
+msgid "A_6"
+msgstr "A_6"
+
+#. Radio button for cropping page to US letter size
+#: src/app-window.ui:364
+msgid "_Letter"
+msgstr "信件(_L)"
+
+#. Radio button for cropping to page to US legal size
+#: src/app-window.ui:375
+msgid "Le_gal"
+msgstr "法定(_G)"
+
+#. Radio button for cropping page to 4x6 inch
+#: src/app-window.ui:386
+msgid "4×6"
+msgstr "4×6"
+
+#. Radio button for cropping to custom page size
+#: src/app-window.ui:397
+msgid "_Custom"
+msgstr "自定义(_C)"
+
+#. Menu item to rotate the crop area
+#: src/app-window.ui:415
+msgid "_Rotate Crop"
+msgstr "旋转剪裁(_R)"
+
+#. Menu item to move the selected page to the left
+#: src/app-window.ui:428
+msgid "Move Left"
+msgstr "左移"
+
+#. Menu item to move the selected page to the right
+#: src/app-window.ui:437
+msgid "Move Right"
+msgstr "右移"
+
+#. Label on help menu
+#: src/app-window.ui:474
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#. Help|Contents menu
+#: src/app-window.ui:482
+msgid "_Contents"
+msgstr "内容(_C)"
+
+#. Tooltip for scan toolbar button
+#: src/app-window.ui:520 src/app-window.ui:720
+msgid "Scan a single page from the scanner"
+msgstr "从扫描仪扫描一个单页"
+
+#. Label on scan toolbar item
+#: src/app-window.ui:522 src/app-window.ui:716
+msgid "Scan"
+msgstr "扫描"
+
+#. Tooltip for save toolbar button
+#: src/app-window.ui:538 src/app-window.ui:787
+msgid "Save document to a file"
+msgstr "将文档保存为文件"
+
+#: src/app-window.ui:540
+msgid "Save"
+msgstr "保存"
+
+#. Tooltip for stop button
+#: src/app-window.ui:555 src/app-window.ui:700
+msgid "Stop the current scan"
+msgstr "停止当前扫描"
+
+#: src/app-window.ui:556 src/app-window.ui:697
+msgid "Stop"
+msgstr "停止"
+
+#. Label shown when searching for scanners
+#: src/app-window.ui:611
+msgid "Searching for Scanners…"
+msgstr "正在探测扫描仪…"
+
+#: src/app-window.vala:237 src/app-window.vala:1380
 msgid "_Close"
 msgstr "关闭(_C)"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: ../src/app-window.vala:246
+#: src/app-window.vala:246
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "访问“%s”需要用户名和密码"
 
 #. Label shown when detected a scanner
-#: ../src/app-window.vala:266 ../src/app-window.vala:584
+#: src/app-window.vala:266 src/app-window.vala:584
 msgid "Ready to Scan"
 msgstr "扫描准备就绪"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: ../src/app-window.vala:273
+#: src/app-window.vala:273
 msgid "Additional software needed"
 msgstr "需要安装其他软件"
 
 #. Instructions to install driver software
-#: ../src/app-window.vala:275
+#: src/app-window.vala:275
 msgid ""
 "You need to <a href=\"install-firmware\">install driver software</a> for "
 "your scanner."
 msgstr "您需要为您的扫描仪 <a href=\"install-firmware\"></a> 安装驱动软件。"
 
 #. Warning displayed when no scanners are detected
-#: ../src/app-window.vala:281
+#: src/app-window.vala:281
 msgid "No scanners detected"
 msgstr "没有发现扫描仪"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/app-window.vala:283
+#: src/app-window.vala:283
 msgid "Please check your scanner is connected and powered on"
 msgstr "请检查您的扫描仪已经连接并且打开"
 
 #. Save dialog: Dialog title
-#: ../src/app-window.vala:298
+#: src/app-window.vala:298
 msgid "Save As…"
 msgstr "保存为…"
 
-#: ../src/app-window.vala:301 ../src/app-window.vala:471
-#: ../src/app-window.vala:552
+#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/app-window.vala:302 ../src/app-window.vala:553
+#: src/app-window.vala:302 src/app-window.vala:553
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. Default filename to use when saving document
-#: ../src/app-window.vala:310
+#: src/app-window.vala:310
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: ../src/app-window.vala:316
+#: src/app-window.vala:316
 msgid "Image Files"
 msgstr "图像文件"
 
 #. Save dialog: Filter name to show all files
-#: ../src/app-window.vala:326
+#: src/app-window.vala:326
 msgid "All Files"
 msgstr "所有文件"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/app-window.vala:335
+#: src/app-window.vala:335
 msgid "PDF (multi-page document)"
 msgstr "PDF（多页文档）"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/app-window.vala:341
+#: src/app-window.vala:341
 msgid "JPEG (compressed)"
 msgstr "JPEG（压缩）"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/app-window.vala:347
+#: src/app-window.vala:347
 msgid "PNG (lossless)"
 msgstr "PNG（无损）"
 
 #. Save dialog: Label for sabing in WEBP format
-#: ../src/app-window.vala:354
+#: src/app-window.vala:354
 msgid "WebP (compressed)"
 msgstr "WebP（压缩）"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: ../src/app-window.vala:364
+#: src/app-window.vala:364
 msgid "File format:"
 msgstr "文件格式："
 
 #. Label in save dialog beside compression slider
-#: ../src/app-window.vala:376
+#: src/app-window.vala:376
 msgid "Compression:"
 msgstr "压缩模式："
 
 #. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file.
-#: ../src/app-window.vala:470
+#: src/app-window.vala:470
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "文件“%s”已存在。要替换该文件吗？"
 
 #. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file.
-#: ../src/app-window.vala:473
+#: src/app-window.vala:473
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: ../src/app-window.vala:512
+#: src/app-window.vala:512
 msgid "Saving"
 msgstr "正在保存"
 
 #. Title of error dialog when save failed
-#: ../src/app-window.vala:527
+#: src/app-window.vala:527
 msgid "Failed to save file"
 msgstr "保存文件错误"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/app-window.vala:550
+#: src/app-window.vala:550
 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/app-window.vala:591
+#: src/app-window.vala:591
 msgid "Save current document?"
 msgstr "保存当前文档？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/app-window.vala:593
+#: src/app-window.vala:593
 msgid "Discard Changes"
 msgstr "放弃更改"
 
 #. Label shown when scan started
-#: ../src/app-window.vala:692
+#: src/app-window.vala:692
 msgid "Contacting scanner…"
 msgstr "正在访问扫描仪…"
 
 #. Error message display when unable to save image for preview
-#: ../src/app-window.vala:800
+#: src/app-window.vala:800
 msgid "Unable to save image for preview"
 msgstr "无法保存用以预览的图像"
 
 #. Error message display when unable to preview image
-#: ../src/app-window.vala:812
+#: src/app-window.vala:812
 msgid "Unable to open image preview application"
 msgstr "无法打开图像预览软件"
 
-#. Title of dialog to reorder pages
-#: ../src/app-window.vala:967 ../src/app-window.vala:1590
-msgid "Reorder Pages"
-msgstr "重新排序页面"
-
 #. Label on button for combining sides in reordering dialog
-#: ../src/app-window.vala:990
+#: src/app-window.vala:990
 msgid "Combine sides"
 msgstr "合并页"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/app-window.vala:1000
+#: src/app-window.vala:1000
 msgid "Combine sides (reverse)"
 msgstr "合并页(反向)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/app-window.vala:1010
+#: src/app-window.vala:1010
 msgid "Reverse"
 msgstr "反向"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/app-window.vala:1020
+#: src/app-window.vala:1020
 msgid "Keep unchanged"
 msgstr "保持不变"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/app-window.vala:1250
+#: src/app-window.vala:1250
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
 #. The license this software is under (GPL3+)
-#: ../src/app-window.vala:1271
+#: src/app-window.vala:1271
 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"
@@ -325,16 +534,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/app-window.vala:1274
+#: src/app-window.vala:1274
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
 #. Description of program
-#: ../src/app-window.vala:1277
+#: src/app-window.vala:1277
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: ../src/app-window.vala:1286
+#: src/app-window.vala:1286
 msgid "translator-credits"
 msgstr ""
 "Mingcong Bai <jeffbai@aosc.xyz>, 2017.\n"
@@ -358,22 +567,22 @@ msgstr ""
 "  zixue.liu https://launchpad.net/~zixue"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/app-window.vala:1308
+#: src/app-window.vala:1308
 msgid "Save document before quitting?"
 msgstr "退出前保存文档？"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/app-window.vala:1310
+#: src/app-window.vala:1310
 msgid "Quit without Saving"
 msgstr "退出且不保存"
 
 #. Message to indicate a Brother scanner has been detected
-#: ../src/app-window.vala:1357
+#: src/app-window.vala:1357
 msgid "You appear to have a Brother scanner."
 msgstr "您似乎有一个 Brother 扫描仪。"
 
 #. Instructions on how to install Brother scanner drivers
-#: ../src/app-window.vala:1359
+#: src/app-window.vala:1359
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -381,12 +590,12 @@ msgstr ""
 "该驱动程序可在 <a href=\"http://support.brother.com\">兄弟网站</a>获得。"
 
 #. Message to indicate a Samsung scanner has been detected
-#: ../src/app-window.vala:1363
+#: src/app-window.vala:1363
 msgid "You appear to have a Samsung scanner."
 msgstr "您似乎有一个 Samsung 扫描仪。"
 
 #. Instructions on how to install Samsung scanner drivers
-#: ../src/app-window.vala:1365
+#: src/app-window.vala:1365
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -394,17 +603,17 @@ msgstr ""
 "该驱动程序可在<a href=\"http://samsung.com/support\">三星网站</a>获得。"
 
 #. Message to indicate a HP scanner has been detected
-#: ../src/app-window.vala:1369
+#: src/app-window.vala:1369
 msgid "You appear to have an HP scanner."
 msgstr "您似乎有一个 HP 扫描仪。"
 
 #. Message to indicate an Epson scanner has been detected
-#: ../src/app-window.vala:1374
+#: src/app-window.vala:1374
 msgid "You appear to have an Epson scanner."
 msgstr "您似乎有一个 Epson 扫描仪。"
 
 #. Instructions on how to install Epson scanner drivers
-#: ../src/app-window.vala:1376
+#: src/app-window.vala:1376
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -412,472 +621,406 @@ msgstr ""
 "该驱动程序可在<a href=\"http://support.epson.com\">爱普生网站</a>获得。"
 
 #. Title of dialog giving instructions on how to install drivers
-#: ../src/app-window.vala:1380
+#: src/app-window.vala:1380
 msgid "Install drivers"
 msgstr "安装驱动"
 
 #. Message in driver install dialog
-#: ../src/app-window.vala:1411
+#: src/app-window.vala:1411
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "安装完成后，需要重新启动扫描易。"
 
 #. Label shown while installing drivers
-#: ../src/app-window.vala:1423
+#: src/app-window.vala:1423
 msgid "Installing drivers…"
 msgstr "正在安装驱动程序…"
 
 #. Label shown once drivers successfully installed
-#: ../src/app-window.vala:1431
+#: src/app-window.vala:1431
 msgid "Drivers installed successfully!"
 msgstr "成功安装驱动程序！"
 
 #. Label shown if failed to install drivers
-#: ../src/app-window.vala:1441
+#: src/app-window.vala:1441
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "无法安装驱动程序(错误码 %d)。"
 
 #. Label shown if failed to install drivers
-#: ../src/app-window.vala:1447
+#: src/app-window.vala:1447
 msgid "Failed to install drivers."
 msgstr "安装驱动失败。"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: ../src/app-window.vala:1454
+#: src/app-window.vala:1454
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "您需要安装 %s 软件包。"
 
-#. Set HeaderBar title here because Glade doesn't keep it translated
-#. https://bugzilla.gnome.org/show_bug.cgi?id=782753
-#. Title of scan window
-#: ../src/app-window.vala:1560
-msgid "Simple Scan"
-msgstr "扫描易"
-
-#: ../src/app-window.vala:1568 ../src/app-window.vala:1591
+#. Title of preferences dialog
+#: src/app-window.vala:1568 src/app-window.vala:1591
+#: src/preferences-dialog.ui:53
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../src/app-window.vala:1572
+#: src/app-window.vala:1572
 msgid "Keyboard Shortcuts"
 msgstr "键盘快捷键"
 
-#: ../src/app-window.vala:1573
+#: src/app-window.vala:1573
 msgid "Help"
 msgstr "帮助"
 
-#: ../src/app-window.vala:1574
+#: src/app-window.vala:1574
 msgid "About"
 msgstr "关于"
 
-#: ../src/app-window.vala:1575
+#: src/app-window.vala:1575
 msgid "Quit"
 msgstr "退出"
 
-#: ../src/app-window.vala:1589
+#: src/app-window.vala:1589
 msgid "Email"
 msgstr "电子邮件"
 
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: ../src/app-window.vala:1599
+#: src/app-window.vala:1599
 msgid "Start Again…"
 msgstr "重新扫描…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../src/app-window.vala:1616
+#: src/app-window.vala:1616
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "左旋页面 (逆时针)"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../src/app-window.vala:1623
+#: src/app-window.vala:1623
 msgid "Rotate the page to the right (clockwise)"
 msgstr "右旋页面 (顺时针)"
 
 #. Tooltip for crop button
-#: ../src/app-window.vala:1633
+#: src/app-window.vala:1633
 msgid "Crop the selected page"
 msgstr "裁剪选中的页面"
 
 #. Tooltip for delete button
-#: ../src/app-window.vala:1649
+#: src/app-window.vala:1649
 msgid "Delete the selected page"
 msgstr "删除选中的页面"
 
 #. Text of button for cancelling save
-#: ../src/app-window.vala:1814
+#: src/app-window.vala:1814
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/book.vala:331 ../src/book.vala:337
+#. Button to submit authorization dialog
+#: src/authorize-dialog.ui:25
+msgid "_Authorize"
+msgstr "认证(_A)"
+
+#. Label beside username entry
+#: src/authorize-dialog.ui:99
+msgid "_Username for resource:"
+msgstr "资源用户名(_U)："
+
+#. Label beside password entry
+#: src/authorize-dialog.ui:112
+msgid "_Password:"
+msgstr "密码(_P)："
+
+#: src/book.vala:331 src/book.vala:337
 #, c-format
 msgid "Unable to encode page %i"
 msgstr "无法编码页面 %i"
 
+#: src/help-overlay.ui:12
+msgctxt "shortcut window"
+msgid "Scanning"
+msgstr "正在扫描"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "Scan a single page"
+msgstr "单页扫描"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Scan all pages from document feeder"
+msgstr "扫描所有页面"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Scan continuously from a flatbed scanner"
+msgstr "连续扫描平板扫描仪上的页面"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Stop scan in progress"
+msgstr "中止正在进行的扫描"
+
+#: src/help-overlay.ui:46
+msgctxt "shortcut window"
+msgid "Document Modification"
+msgstr "修改文档"
+
+#: src/help-overlay.ui:51
+msgctxt "shortcut window"
+msgid "Move page left"
+msgstr "左移页面"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Move page right"
+msgstr "右移页面"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Rotate page to the left (anti-clockwise)"
+msgstr "逆时针旋转页面"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Rotate page to the right (clockwise)"
+msgstr "顺时针旋转页面"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Delete page"
+msgstr "删除页面"
+
+#: src/help-overlay.ui:87
+msgctxt "shortcut window"
+msgid "Document Management"
+msgstr "文档管理"
+
+#: src/help-overlay.ui:92
+msgctxt "shortcut window"
+msgid "Start new document"
+msgstr "创建新文档"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Save scanned document"
+msgstr "保存已扫描的文档"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Email scanned document"
+msgstr "使用电子邮件发送已扫描的文档"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Print scanned document"
+msgstr "打印已扫描的文档"
+
+#: src/help-overlay.ui:120
+msgctxt "shortcut window"
+msgid "Copy current page to clipboard"
+msgstr "将当前页面复制到剪贴板"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:113
+msgid "_Scanner"
+msgstr "扫描仪(_S)"
+
+#. Label beside scan side combo box
+#: src/preferences-dialog.ui:143
+msgid "Scan Sides"
+msgstr "扫描面"
+
+#. Label beside page size combo box
+#: src/preferences-dialog.ui:160
+msgid "Page Size"
+msgstr "页面大小"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:191
+msgid "Front"
+msgstr "正面"
+
+#. Preferences Dialog: Toggle button to select scanning on the back side of a page
+#: src/preferences-dialog.ui:206
+msgid "Back"
+msgstr "背面"
+
+#. Preferences Dialog: Toggle button to select scanning on both sides of a page
+#: src/preferences-dialog.ui:221
+msgid "Both"
+msgstr "双面"
+
+#. Label beside page delay scale
+#: src/preferences-dialog.ui:260
+msgid "Delay"
+msgstr "延迟"
+
+#. Preferences dialog: Label above settings for scanning multiple pages from a flatbed
+#: src/preferences-dialog.ui:276
+msgid "Multiple pages from flatbed"
+msgstr "来自扫描床的多个页面"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:295
+msgid "3"
+msgstr "3"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:310
+msgid "5"
+msgstr "5"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:326
+msgid "7"
+msgstr "7"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:342
+msgid "10"
+msgstr "10"
+
+#. Preferences Dialog: Toggle button to select scanning on front side of a page
+#: src/preferences-dialog.ui:358
+msgid "15"
+msgstr "15"
+
+#. Label after page delay radio buttons
+#: src/preferences-dialog.ui:385
+msgid "Seconds"
+msgstr "秒"
+
+#. Preferences Dialog: Tab label for scanning settings
+#: src/preferences-dialog.ui:413
+msgid "Scanning"
+msgstr "正在扫描"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:436
+msgid "_Text Resolution"
+msgstr "文字分辨率(_T)"
+
+#. Label beside scan source combo box
+#: src/preferences-dialog.ui:452
+msgid "_Photo Resolution"
+msgstr "图像分辨率(_P)"
+
+#. Label beside brightness scale
+#: src/preferences-dialog.ui:505
+msgid "Brightness"
+msgstr "亮度"
+
+#. Label beside contrast scale
+#: src/preferences-dialog.ui:521
+msgid "Contrast"
+msgstr "对比度"
+
+#. Preferences Dialog: Tab for quality settings
+#: src/preferences-dialog.ui:576
+msgid "Quality"
+msgstr "质量"
+
 #. Combo box value for automatic paper size
-#: ../src/preferences-dialog.vala:77
+#: src/preferences-dialog.vala:77
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/preferences-dialog.vala:116
+#: src/preferences-dialog.vala:116
 msgid "Darker"
 msgstr "较深"
 
-#: ../src/preferences-dialog.vala:118
+#: src/preferences-dialog.vala:118
 msgid "Lighter"
 msgstr "稍浅"
 
-#: ../src/preferences-dialog.vala:126
+#: src/preferences-dialog.vala:126
 msgid "Less"
 msgstr "较少"
 
-#: ../src/preferences-dialog.vala:128
+#: src/preferences-dialog.vala:128
 msgid "More"
 msgstr "更多"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/preferences-dialog.vala:440
+#: src/preferences-dialog.vala:440
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (默认)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/preferences-dialog.vala:443
+#: src/preferences-dialog.vala:443
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/preferences-dialog.vala:446
+#: src/preferences-dialog.vala:446
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高分辨率)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/preferences-dialog.vala:449
+#: src/preferences-dialog.vala:449
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
 #. Error displayed when no scanners to scan with
-#: ../src/scanner.vala:844
+#: src/scanner.vala:844
 msgid "No scanners available.  Please connect a scanner."
 msgstr "没有可用的扫描仪。请连接一个扫描仪。"
 
 #. Error displayed when cannot connect to scanner
-#: ../src/scanner.vala:874
+#: src/scanner.vala:874
 msgid "Unable to connect to scanner"
 msgstr "无法连接到扫描仪"
 
 #. Error display when unable to start scan
-#: ../src/scanner.vala:1227
+#: src/scanner.vala:1227
 msgid "Unable to start scan"
 msgstr "无法开始扫描"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.vala:1240 ../src/scanner.vala:1340
+#: src/scanner.vala:1240 src/scanner.vala:1340
 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:392
+#: src/simple-scan.vala:392
 msgid "Failed to scan"
 msgstr "扫描失败"
 
 #. Attempt to inhibit the screensaver when scanning
-#: ../src/simple-scan.vala:407
+#: src/simple-scan.vala:407
 msgid "Scan in progress"
 msgstr "正在扫描"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:584
+#: src/simple-scan.vala:584
 msgid "[DEVICE…] — Scanning utility"
 msgstr "[设备…] — 扫描工具"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:595
+#: src/simple-scan.vala:595
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
 
-#~ msgid "Scan Documents"
-#~ msgstr "扫描文档"
-
-#~ 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 "
-#~ "print your scans, export them to pdf, or save them in a range of image "
-#~ "formats."
-#~ msgstr ""
-#~ "简单的文档和照片扫描软件。如果图片显示有误，您可以根据需要通过裁剪、旋转等"
-#~ "方式调整照片。您也可以打印扫描件、导出 PDF 格式、或者保存为图片。"
-
-#~ msgid ""
-#~ "Simple Scan uses the SANE framework to support most existing scanners."
-#~ msgstr "扫描易使用 SANE 框架支持大多数现有的扫描仪。"
-
-#~ msgid "Document Scanner"
-#~ msgstr "文档扫描仪"
-
-#~ msgid "scan;scanner;flatbed;adf;"
-#~ msgstr "scan;scanner;flatbed;adf;扫描;扫描仪;"
-
-#~ msgid "scanner"
-#~ msgstr "扫描仪"
-
-#~ msgid "Single _Page"
-#~ msgstr "单页(_P)"
-
-#~ msgid "All Pages From _Feeder"
-#~ msgstr "传送来的所有页面(_F)"
-
-#~ msgid "_Multiple Pages From Flatbed"
-#~ msgstr "来自扫描床的多个页面(_M)"
-
-#~ msgid "Text"
-#~ msgstr "文本"
-
-#~ msgid "Photo"
-#~ msgstr "照片"
-
-#~ msgid "_Document"
-#~ msgstr "文档(_D)"
-
-#~ msgid "Sc_an"
-#~ msgstr "扫描(_A)"
-
-#~ msgid "_Stop Scan"
-#~ msgstr "停止扫描(_S)"
-
-#~ msgid "_Email"
-#~ msgstr "电子邮件(_E)"
-
-#~ msgid "_Page"
-#~ msgstr "页面(_P)"
-
-#~ msgid "Rotate _Left"
-#~ msgstr "向左旋转(_L)"
-
-#~ msgid "Rotate _Right"
-#~ msgstr "向右旋转(_R)"
-
-#~ msgid "_Crop"
-#~ msgstr "剪裁(_C)"
-
-#~ msgid "_None"
-#~ msgstr "无(_N)"
-
-#~ msgid "A_4"
-#~ msgstr "A_4"
-
-#~ msgid "A_5"
-#~ msgstr "A_5"
-
-#~ msgid "A_6"
-#~ msgstr "A_6"
-
-#~ msgid "_Letter"
-#~ msgstr "信件(_L)"
-
-#~ msgid "Le_gal"
-#~ msgstr "法定(_G)"
-
-#~ msgid "4×6"
-#~ msgstr "4×6"
-
-#~ msgid "_Custom"
-#~ msgstr "自定义(_C)"
-
-#~ msgid "_Rotate Crop"
-#~ msgstr "旋转剪裁(_R)"
-
-#~ msgid "Move Left"
-#~ msgstr "左移"
-
-#~ msgid "Move Right"
-#~ msgstr "右移"
-
-#~ msgid "_Help"
-#~ msgstr "帮助(_H)"
-
-#~ msgid "_Contents"
-#~ msgstr "内容(_C)"
-
-#~ msgid "Scan a single page from the scanner"
-#~ msgstr "从扫描仪扫描一个单页"
-
-#~ msgid "Scan"
-#~ msgstr "扫描"
-
-#~ msgid "Save document to a file"
-#~ msgstr "将文档保存为文件"
-
-#~ msgid "Save"
-#~ msgstr "保存"
-
-#~ msgid "Stop the current scan"
-#~ msgstr "停止当前扫描"
-
-#~ msgid "Stop"
-#~ msgstr "停止"
-
-#~ msgid "Searching for Scanners…"
-#~ msgstr "正在探测扫描仪…"
-
-#~ msgid "_Authorize"
-#~ msgstr "认证(_A)"
-
-#~ msgid "_Username for resource:"
-#~ msgstr "资源用户名(_U)："
-
-#~ msgid "_Password:"
-#~ msgstr "密码(_P)："
-
-#~ msgctxt "shortcut window"
-#~ msgid "Scanning"
-#~ msgstr "正在扫描"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Scan a single page"
-#~ msgstr "单页扫描"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Scan all pages from document feeder"
-#~ msgstr "扫描所有页面"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Scan continuously from a flatbed scanner"
-#~ msgstr "连续扫描平板扫描仪上的页面"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Stop scan in progress"
-#~ msgstr "中止正在进行的扫描"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Document Modification"
-#~ msgstr "修改文档"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Move page left"
-#~ msgstr "左移页面"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Move page right"
-#~ msgstr "右移页面"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Rotate page to the left (anti-clockwise)"
-#~ msgstr "逆时针旋转页面"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Rotate page to the right (clockwise)"
-#~ msgstr "顺时针旋转页面"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Delete page"
-#~ msgstr "删除页面"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Document Management"
-#~ msgstr "文档管理"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Start new document"
-#~ msgstr "创建新文档"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Save scanned document"
-#~ msgstr "保存已扫描的文档"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Email scanned document"
-#~ msgstr "使用电子邮件发送已扫描的文档"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Print scanned document"
-#~ msgstr "打印已扫描的文档"
-
-#~ msgctxt "shortcut window"
-#~ msgid "Copy current page to clipboard"
-#~ msgstr "将当前页面复制到剪贴板"
-
-#~ msgid "_Scanner"
-#~ msgstr "扫描仪(_S)"
-
-#~ msgid "Scan Sides"
-#~ msgstr "扫描面"
-
-#~ msgid "Page Size"
-#~ msgstr "页面大小"
-
-#~ msgid "Front"
-#~ msgstr "正面"
-
-#~ msgid "Back"
-#~ msgstr "背面"
-
-#~ msgid "Both"
-#~ msgstr "双面"
-
-#~ msgid "Delay"
-#~ msgstr "延迟"
-
-#~ msgid "Multiple pages from flatbed"
-#~ msgstr "来自扫描床的多个页面"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "10"
-#~ msgstr "10"
-
-#~ msgid "15"
-#~ msgstr "15"
-
-#~ msgid "Seconds"
-#~ msgstr "秒"
-
-#~ msgid "Scanning"
-#~ msgstr "正在扫描"
-
-#~ msgid "_Text Resolution"
-#~ msgstr "文字分辨率(_T)"
-
-#~ msgid "_Photo Resolution"
-#~ msgstr "图像分辨率(_P)"
-
-#~ msgid "Brightness"
-#~ msgstr "亮度"
-
-#~ msgid "Contrast"
-#~ msgstr "对比度"
-
-#~ msgid "Quality"
-#~ msgstr "质量"
-
 #~ msgid "Front and Back"
 #~ msgstr "正面和背面"