Merge tag 'upstream/3.20.0'

Upstream version 3.20.0

9 files changed, 30 insertions, 32 deletions

diff --git a/help/zh_TW/adf.page b/help/zh_TW/adf.page
index 36fc104..3632181 100644
--- a/help/zh_TW/adf.page
+++ b/help/zh_TW/adf.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
 
-	<title>Using an Automatic Document Feeder</title>
+	<title>使用自動送紙器</title>
 
     <p>
     If your scanner features an Automatic Document Feeder (ADF) 
diff --git a/help/zh_TW/dpi.page b/help/zh_TW/dpi.page
index f127718..9523675 100644
--- a/help/zh_TW/dpi.page
+++ b/help/zh_TW/dpi.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Setting the Scan Resolution</title>
+	<title>設定掃描解析度</title>
 
     <p>
     The default resolution for document type <gui><em>Text</em></gui> is 150 dpi (dots per inch)
diff --git a/help/zh_TW/email.page b/help/zh_TW/email.page
index 54ee14e..e5e078d 100644
--- a/help/zh_TW/email.page
+++ b/help/zh_TW/email.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#use"/>
     </info>
   
-	<title>Sending via Email</title>
+	<title>以電子郵件傳送</title>
 
     <p>
     To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
@@ -17,7 +17,5 @@
     Conversely, if the document type was set to "Photo", the email will have a JPEG
     attachment for each page.    
     </p>
-    <p>
-    See <link xref="save"/> for more information about file formats.
-    </p>
+    <p>有關檔案格式的更多資訊，請見 <link xref="save"/>。</p>
 </page>
diff --git a/help/zh_TW/index.page b/help/zh_TW/index.page
index b8fb100..3c902aa 100644
--- a/help/zh_TW/index.page
+++ b/help/zh_TW/index.page
@@ -16,15 +16,15 @@
 	<title><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
     
     <section id="acquire" style="2column">
-        <title>Scanning Pages</title>
+        <title>掃描頁面</title>
     </section>
 
     <section id="modify" style="2column">
-        <title>Modifying the Document</title>
+        <title>修改文年</title>
     </section>
 
     <section id="use" style="2column">
-        <title>Using the Document</title>
+        <title>使用文件</title>
     </section>
 
     <section id="shortcuts" style="2column">
diff --git a/help/zh_TW/reorder.page b/help/zh_TW/reorder.page
index 936efae..99c4bc6 100644
--- a/help/zh_TW/reorder.page
+++ b/help/zh_TW/reorder.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#modify"/>
     </info>
   
-	<title>Reordering Pages</title>
+	<title>為頁面重新排序</title>
 
     <p>
     To move a page, right click on it and choose <gui><em>Move Left</em></gui> or 
diff --git a/help/zh_TW/save.page b/help/zh_TW/save.page
index b40085e..6d2dfd2 100644
--- a/help/zh_TW/save.page
+++ b/help/zh_TW/save.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#use"/>
     </info>
   
-	<title>Saving to a File</title>
+	<title>儲存至檔案</title>
 
     <steps>
       <item>
diff --git a/help/zh_TW/scanner.page b/help/zh_TW/scanner.page
index 424dfc3..0dfc083 100644
--- a/help/zh_TW/scanner.page
+++ b/help/zh_TW/scanner.page
@@ -5,7 +5,7 @@
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Selecting a Scanner</title>
+	<title>選取掃描器</title>
 
     <p>
     If you have multiple scanning devices you can change the selected device from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
diff --git a/help/zh_TW/scanning.page b/help/zh_TW/scanning.page
index c1d0d28..ad1c811 100644
--- a/help/zh_TW/scanning.page
+++ b/help/zh_TW/scanning.page
@@ -6,14 +6,14 @@
         <link type="guide" xref="index#acquire"/>
     </info>
   
-	<title>Scanning a Page</title>
+	<title>掃描頁面</title>
 
     <p>
     To scan a document from your scanner:
     </p>
     <steps>
       <item><p>Connect the scanner to your computer and power it on.</p></item>
-      <item><p>Open <app>Simple Scan</app>.</p></item>
+      <item><p>開啟<app>掃描易</app>。</p></item>
       <item><p>Click the arrow to the right of the "Scan" button and choose the type
 	     of document you are scanning: <em>Photo</em> or <em>Text</em>.</p>
 	     <media type="image" src="figures/scan_toolbar.png"/></item>
diff --git a/help/zh_TW/zh_TW.po b/help/zh_TW/zh_TW.po
index c2bfe55..b13d1cf 100644
--- a/help/zh_TW/zh_TW.po
+++ b/help/zh_TW/zh_TW.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-04-17 16:01+1000\n"
-"PO-Revision-Date: 2012-10-25 09:24+0000\n"
+"PO-Revision-Date: 2016-02-16 05:12+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@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-02-17 05:14+0000\n"
+"X-Generator: Launchpad (build 17925)\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -34,19 +34,19 @@ msgstr ""
 
 #: C/index.page:16(section/title)
 msgid "Scanning Pages"
-msgstr ""
+msgstr "掃描頁面"
 
 #: C/index.page:20(section/title)
 msgid "Modifying the Document"
-msgstr ""
+msgstr "修改文年"
 
 #: C/index.page:24(section/title)
 msgid "Using the Document"
-msgstr ""
+msgstr "使用文件"
 
 #: C/adf.page:9(page/title)
 msgid "Using an Automatic Document Feeder"
-msgstr ""
+msgstr "使用自動送紙器"
 
 #: C/adf.page:11(page/p)
 msgid ""
@@ -92,7 +92,7 @@ msgstr ""
 
 #: C/dpi.page:9(page/title)
 msgid "Setting the Scan Resolution"
-msgstr ""
+msgstr "設定掃描解析度"
 
 #: C/dpi.page:11(page/p)
 msgid ""
@@ -103,7 +103,7 @@ msgstr ""
 
 #: C/email.page:9(page/title)
 msgid "Sending via Email"
-msgstr ""
+msgstr "以電子郵件傳送"
 
 #: C/email.page:11(page/p)
 msgid ""
@@ -121,7 +121,7 @@ msgstr ""
 
 #: C/email.page:18(page/p)
 msgid "See <link xref=\"save\"/> for more information about file formats."
-msgstr ""
+msgstr "有關檔案格式的更多資訊，請見 <link xref=\"save\"/>。"
 
 #: C/legal.xml:4(p/link)
 msgid "Creative Commons Attribution-Share Alike 3.0 Unported License"
@@ -151,7 +151,7 @@ msgstr ""
 
 #: C/reorder.page:9(page/title)
 msgid "Reordering Pages"
-msgstr ""
+msgstr "為頁面重新排序"
 
 #: C/reorder.page:11(page/p)
 msgid ""
@@ -165,7 +165,7 @@ msgstr ""
 
 #: C/rotate.page:9(page/title)
 msgid "Rotating Pages"
-msgstr ""
+msgstr "旋轉頁面"
 
 #: C/rotate.page:11(page/p)
 msgid ""
@@ -176,7 +176,7 @@ msgstr ""
 
 #: C/save.page:9(page/title)
 msgid "Saving to a File"
-msgstr ""
+msgstr "儲存至檔案"
 
 #: C/save.page:11(page/p)
 msgid ""
@@ -234,7 +234,7 @@ msgstr ""
 
 #: C/scanner.page:9(page/title)
 msgid "Selecting a Scanner"
-msgstr ""
+msgstr "選取掃描器"
 
 #: C/scanner.page:11(page/p)
 msgid ""
@@ -257,7 +257,7 @@ msgstr "0"
 
 #: C/scanning.page:10(page/title)
 msgid "Scanning a Page"
-msgstr ""
+msgstr "掃描頁面"
 
 #: C/scanning.page:12(page/p)
 msgid "To scan a document from your scanner:"
@@ -269,13 +269,13 @@ msgstr ""
 
 #: C/scanning.page:22(item/p)
 msgid "Open <app>Simple Scan</app>."
-msgstr ""
+msgstr "開啟<app>掃描易</app>。"
 
 #: C/scanning.page:27(item/p)
 msgid ""
 "Press the scan button in the toolbar (or "
 "<keyseq><key>Ctrl</key><key>1</key></keyseq>)."
-msgstr ""
+msgstr "按下工具列的「掃描」鍵 (或 <keyseq><key>Ctrl</key><key>1</key></keyseq>)。"
 
 #: C/scanning.page:33(page/p)
 msgid "The page will be shown as it is scanned."
@@ -299,4 +299,4 @@ msgstr ""
 
 #: C/scanning.page:47(page/p)
 msgid "To stop the scan at any time press <key>Escape</key>."
-msgstr ""
+msgstr "任何時候想終止掃描，按 <key>Esc</key>。"