Merge branch 'feature/upstream' into develop

1 files changed, 98 insertions, 97 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0457dcb..9bbf126 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2019-02-07 15:48+0000\n"
-"PO-Revision-Date: 2019-02-17 23:25+0800\n"
+"POT-Creation-Date: 2019-10-06 18:53+0000\n"
+"PO-Revision-Date: 2019-10-08 19:12+0800\n"
 "Last-Translator: pan93412 <pan93412@gmail.com>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2017-04-25 06:10+0000\n"
-"X-Generator: Lokalize 18.12.2\n"
+"X-Generator: Lokalize 19.08.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/org.gnome.SimpleScan.gschema.xml:11
 msgid "Device to scan from"
-msgstr "要從哪個裝置掃描"
+msgstr "裝置掃描來源"
 
 #: data/org.gnome.SimpleScan.gschema.xml:12
 msgid "SANE device to acquire images from."
@@ -128,11 +128,11 @@ msgstr "每頁之間的延遲毫秒數。"
 #. 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:181 src/app-window.vala:1265 src/app-window.vala:1519
-msgid "Simple Scan"
-msgstr "簡易掃描"
+#: src/app-window.ui:181 src/app-window.vala:1302 src/app-window.vala:1556
+msgid "Document Scanner"
+msgstr "文件掃描"
 
-#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:5
+#: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:4
 msgid "Scan Documents"
 msgstr "掃描文件"
 
@@ -147,23 +147,16 @@ 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 "文件掃描"
+#| msgid ""
+#| "Simple Scan uses the SANE framework to support most existing scanners."
+msgid "This app uses the SANE framework to support most existing scanners."
+msgstr "這個應用程式使用 SANE 框架以支援大部分現存掃描器。"
 
 #. 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
+#: data/simple-scan.desktop.in:6
 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"
-
 #. Menu item to rotate page to left (anti-clockwise)
 #: src/app-window.ui:10
 msgid "Rotate _Left"
@@ -264,7 +257,6 @@ msgid "Save document to a file"
 msgstr "將文件儲存至檔案"
 
 #: src/app-window.ui:405
-#| msgid "Single _Page"
 msgid "_Single Page"
 msgstr "單頁(_S)"
 
@@ -277,7 +269,6 @@ msgid "_Multiple Pages From Flatbed"
 msgstr "從平臺多頁掃描(_M)"
 
 #: src/app-window.ui:498
-#| msgid "Text"
 msgid "_Text"
 msgstr "文字(_T)"
 
@@ -285,190 +276,189 @@ msgstr "文字(_T)"
 msgid "_Image"
 msgstr "圖片(_I)"
 
-#: src/app-window.vala:223 src/app-window.vala:1352
+#: src/app-window.vala:225 src/app-window.vala:1389
 msgid "_Close"
 msgstr "關閉(_C)"
 
 #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization
-#: src/app-window.vala:232
+#: src/app-window.vala:234
 #, c-format
 msgid "Username and password required to access “%s”"
 msgstr "若要存取「%s」則必須提供使用者名稱與密碼"
 
 #. Label shown when searching for scanners
-#: src/app-window.vala:248
+#: src/app-window.vala:250
 msgid "Searching for Scanners…"
 msgstr "正在搜尋掃描器…"
 
 #. Label shown when detected a scanner
-#: src/app-window.vala:254
+#: src/app-window.vala:256
 msgid "Ready to Scan"
 msgstr "準備掃描"
 
 #. Warning displayed when no drivers are installed but a compatible scanner is detected
-#: src/app-window.vala:261
+#: src/app-window.vala:263
 msgid "Additional software needed"
 msgstr "需要額外軟體"
 
 #. Instructions to install driver software
-#: src/app-window.vala:263
+#: src/app-window.vala:265
 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:269
+#: src/app-window.vala:271
 msgid "No scanners detected"
 msgstr "沒有偵測到掃描器"
 
 #. Hint to user on why there are no scanners detected
-#: src/app-window.vala:271
+#: src/app-window.vala:273
 msgid "Please check your scanner is connected and powered on"
 msgstr "請檢查您的掃描器是否連接，並且是否開啟電源"
 
 #. Save dialog: Dialog title
-#: src/app-window.vala:294
+#: src/app-window.vala:296
 msgid "Save As…"
 msgstr "另存為…"
 
-#: src/app-window.vala:297 src/app-window.vala:548
+#: src/app-window.vala:299 src/app-window.vala:553
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: src/app-window.vala:298 src/app-window.vala:466 src/app-window.vala:547
+#: src/app-window.vala:300 src/app-window.vala:468 src/app-window.vala:552
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #. Default filename to use when saving document
-#: src/app-window.vala:305
+#: src/app-window.vala:307
 msgid "Scanned Document.pdf"
 msgstr "掃描的文件.pdf"
 
 #. Save dialog: Filter name to show only supported image files
-#: src/app-window.vala:311
+#: src/app-window.vala:313
 msgid "Image Files"
 msgstr "影像檔"
 
 #. Save dialog: Filter name to show all files
-#: src/app-window.vala:321
+#: src/app-window.vala:323
 msgid "All Files"
 msgstr "所有檔案"
 
 #. Save dialog: Label for saving in PDF format
-#: src/app-window.vala:330
+#: src/app-window.vala:332
 msgid "PDF (multi-page document)"
 msgstr "PDF（多頁文件）"
 
 #. Save dialog: Label for saving in JPEG format
-#: src/app-window.vala:336
+#: src/app-window.vala:338
 msgid "JPEG (compressed)"
 msgstr "JPEG（壓縮）"
 
 #. Save dialog: Label for saving in PNG format
-#: src/app-window.vala:342
+#: src/app-window.vala:344
 msgid "PNG (lossless)"
 msgstr "PNG（無損）"
 
 #. Save dialog: Label for sabing in WEBP format
-#: src/app-window.vala:349
+#: src/app-window.vala:351
 msgid "WebP (compressed)"
 msgstr "WebP（壓縮）"
 
 #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP)
-#: src/app-window.vala:359
+#: src/app-window.vala:361
 msgid "File format:"
 msgstr "檔案格式："
 
 #. Label in save dialog beside compression slider
-#: src/app-window.vala:371
+#: src/app-window.vala:373
 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:465
+#: src/app-window.vala:467
 #, 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:468
+#: src/app-window.vala:470
 msgid "_Replace"
 msgstr "取代(_R)"
 
-#: src/app-window.vala:507
+#: src/app-window.vala:509
 msgid "Saving"
 msgstr "儲存"
 
 #. Title of error dialog when save failed
-#: src/app-window.vala:522
+#: src/app-window.vala:526
 msgid "Failed to save file"
 msgstr "儲存檔案失敗"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:545
+#: 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:581
+#: src/app-window.vala:586
 msgid "Save current document?"
 msgstr "是否儲存目前文件？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: src/app-window.vala:583
+#: src/app-window.vala:588
 msgid "Discard Changes"
 msgstr "放棄變更"
 
 #. Label shown when scan started
-#: src/app-window.vala:716
+#: src/app-window.vala:620
 msgid "Contacting scanner…"
 msgstr "正在聯絡掃描器…"
 
 #. Error message display when unable to save image for preview
-#: src/app-window.vala:799
+#: src/app-window.vala:836
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
 #. Error message display when unable to preview image
-#: src/app-window.vala:811
+#: src/app-window.vala:848
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
 #. Title of dialog to reorder pages
-#: src/app-window.vala:973
-#| msgid "Reorder Pages"
+#: src/app-window.vala:1010
 msgctxt "dialog title"
 msgid "Reorder Pages"
 msgstr "重新排列頁面"
 
 #. Label on button for combining sides in reordering dialog
-#: src/app-window.vala:996
+#: src/app-window.vala:1033
 msgid "Combine sides"
 msgstr "合併邊緣"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: src/app-window.vala:1006
+#: src/app-window.vala:1043
 msgid "Combine sides (reverse)"
 msgstr "合併邊緣 (相反次序)"
 
 #. Label on button for reversing in reordering dialog
-#: src/app-window.vala:1016
+#: src/app-window.vala:1053
 msgid "Reverse"
 msgstr "反轉"
 
 #. Label on button for cancelling page reordering dialog
-#: src/app-window.vala:1026
+#: src/app-window.vala:1063
 msgid "Keep unchanged"
 msgstr "維持不變"
 
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1240
+#: src/app-window.vala:1277
 msgid "Unable to open help file"
 msgstr "無法開啟幫助文件檔案"
 
 #. The license this software is under (GPL3+)
-#: src/app-window.vala:1255
+#: src/app-window.vala:1292
 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"
@@ -494,16 +484,17 @@ msgstr ""
 "www.gnu.org/licenses/>。"
 
 #. Title of about dialog
-#: src/app-window.vala:1258 src/app-window.vala:1540
-msgid "About Simple Scan"
-msgstr "關於《簡易掃描》"
+#: src/app-window.vala:1295 src/app-window.vala:1581
+#| msgid "Document Scanner"
+msgid "About Document Scanner"
+msgstr "關於文件掃描"
 
 #. Description of program
-#: src/app-window.vala:1261
+#: src/app-window.vala:1298
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: src/app-window.vala:1270
+#: src/app-window.vala:1307
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -517,22 +508,22 @@ msgstr ""
 "  tomoe_musashi https://launchpad.net/~musashi"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1286
+#: src/app-window.vala:1323
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1288
+#: src/app-window.vala:1325
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1329
+#: src/app-window.vala:1366
 msgid "You appear to have a Brother scanner."
 msgstr "您似乎有一台 Brother 掃描器。"
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1331
+#: src/app-window.vala:1368
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.brother.com"
 "\">Brother website</a>."
@@ -541,12 +532,12 @@ msgstr ""
 "\">Brother 網站</a>。"
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1335
+#: src/app-window.vala:1372
 msgid "You appear to have a Samsung scanner."
 msgstr "您似乎有一台 Samsung 掃描器。"
 
 #. Instructions on how to install Samsung scanner drivers
-#: src/app-window.vala:1337
+#: src/app-window.vala:1374
 msgid ""
 "Drivers for this are available on the <a href=\"http://samsung.com/support"
 "\">Samsung website</a>."
@@ -555,17 +546,17 @@ msgstr ""
 "\">Samsung 網站</a>。"
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1341
+#: src/app-window.vala:1378
 msgid "You appear to have an HP scanner."
 msgstr "您似乎有一台 HP 掃描器。"
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1346
+#: src/app-window.vala:1383
 msgid "You appear to have an Epson scanner."
 msgstr "您似乎有一台 Epson 掃描器。"
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1348
+#: src/app-window.vala:1385
 msgid ""
 "Drivers for this are available on the <a href=\"http://support.epson.com"
 "\">Epson website</a>."
@@ -574,95 +565,95 @@ msgstr ""
 "找到。"
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1352
+#: src/app-window.vala:1389
 msgid "Install drivers"
 msgstr "安裝驅動程式"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1385
-msgid "Once installed you will need to restart Simple Scan."
-msgstr "一旦安裝，您將需要重新啟動簡易掃描。"
+#: src/app-window.vala:1422
+#| msgid "Once installed you will need to restart Simple Scan."
+msgid "Once installed you will need to restart this app."
+msgstr "一旦安裝，您將需要重新啟動此應用程式。"
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1398
+#: src/app-window.vala:1435
 msgid "Installing drivers…"
 msgstr "正在安裝驅動程式..."
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1406
+#: src/app-window.vala:1443
 msgid "Drivers installed successfully!"
 msgstr "成功安裝驅動程式！"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1416
+#: src/app-window.vala:1453
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "驅動程式安裝失敗 (錯誤碼 %d)。"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1422
+#: src/app-window.vala:1459
 msgid "Failed to install drivers."
 msgstr "驅動程式安裝失敗。"
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1429
+#: src/app-window.vala:1466
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
 msgstr[0] "您得先安裝 %s 軟體包。"
 
-#: src/app-window.vala:1533
+#: src/app-window.vala:1574
 msgid "Email"
 msgstr "電子郵件"
 
-#: src/app-window.vala:1534
-#| msgid "Reorder Pages"
+#: src/app-window.vala:1575
 msgctxt "menu"
 msgid "Reorder Pages"
 msgstr "重新排列頁面"
 
 #. Title of preferences dialog
-#: src/app-window.vala:1537 src/preferences-dialog.ui:52
+#: src/app-window.vala:1578 src/preferences-dialog.ui:52
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: src/app-window.vala:1538
+#: src/app-window.vala:1579
 msgid "Keyboard Shortcuts"
 msgstr "鍵盤捷徑鍵"
 
-#: src/app-window.vala:1539
+#: src/app-window.vala:1580
 msgid "Help"
 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:1548
+#: src/app-window.vala:1589
 msgid "Start Again…"
 msgstr "再次開始…"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1567
+#: src/app-window.vala:1608
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "將頁面向左旋轉 (逆時針方向)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1576
+#: src/app-window.vala:1617
 msgid "Rotate the page to the right (clockwise)"
 msgstr "將頁面向右旋轉 (順時針方向)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1588
+#: src/app-window.vala:1629
 msgid "Crop the selected page"
 msgstr "裁切所選的頁面"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1606
+#: src/app-window.vala:1647
 msgid "Delete the selected page"
 msgstr "刪除所選頁面"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:1750
+#: src/app-window.vala:1791
 msgid "Cancel"
 msgstr "取消"
 
@@ -947,8 +938,9 @@ msgid "Print debugging messages"
 msgstr "列印除錯訊息"
 
 #: src/simple-scan.vala:26
-msgid "Fix PDF files generated with older versions of Simple Scan"
-msgstr "修正由舊版本簡易掃描產生的 PDF 檔案"
+#| msgid "Fix PDF files generated with older versions of Simple Scan"
+msgid "Fix PDF files generated with older versions of this app"
+msgstr "修正由舊版本應用程式產生的 PDF 檔案"
 
 #. Title of error dialog when scan failed
 #: src/simple-scan.vala:393
@@ -971,6 +963,15 @@ msgstr "[裝置...] — 掃描公用程式"
 msgid "Run “%s --help” to see a full list of available command line options."
 msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
 
+#~ msgid "Simple Scan"
+#~ msgstr "簡易掃描"
+
+#~ msgid "scanner"
+#~ msgstr "scanner"
+
+#~ msgid "About Simple Scan"
+#~ msgstr "關於《簡易掃描》"
+
 #~ msgid "Photo"
 #~ msgstr "相片"