Merge translation files from master branch.

2 files changed, 52 insertions, 52 deletions

diff --git a/tde-i18n-zh_TW/messages/tdelibs/tdeio.po b/tde-i18n-zh_TW/messages/tdelibs/tdeio.po
index 8b26a8d689d..6d2625c849d 100644
--- a/tde-i18n-zh_TW/messages/tdelibs/tdeio.po
+++ b/tde-i18n-zh_TW/messages/tdelibs/tdeio.po
@@ -6151,17 +6151,6 @@ msgstr ""
 #~ msgid "Unknown unmount error."
 #~ msgstr "不明的錯誤"
 
-#~ msgid ""
-#~ "You may perform a search on the Internet for a TDE program (called a "
-#~ "tdeioslave or ioslave) which supports this protocol. Places to search "
-#~ "include <a href=\"http://kde-apps.org/\">http://kde-apps.org/</a> and <a "
-#~ "href=\"http://freshmeat.net/\">http://freshmeat.net/</a>."
-#~ msgstr ""
-#~ "您可以在網際網路上搜尋一個支援此通訊協定的 TDE 程式 (叫做 tdeioslave 或 "
-#~ "ioslave)。建議從 <a href=\"http://kde-apps.org/\">http://kde-apps.org/</"
-#~ "a> 和 <a href=\"http://freshmeat.net/\">http://freshmeat.net/</a> 這兩個地"
-#~ "方搜尋。"
-
 #, fuzzy
 #~ msgid "Bookmarks"
 #~ msgstr "書籤"
@@ -6208,3 +6197,14 @@ msgstr ""
 
 #~ msgid "Shared"
 #~ msgstr "共用"
+
+#~ msgid ""
+#~ "You may perform a search on the Internet for a TDE program (called a "
+#~ "tdeioslave or ioslave) which supports this protocol. Places to search "
+#~ "include <a href=\"http://kde-apps.org/\">http://kde-apps.org/</a> and <a "
+#~ "href=\"http://freshmeat.net/\">http://freshmeat.net/</a>."
+#~ msgstr ""
+#~ "您可以在網際網路上搜尋一個支援此通訊協定的 TDE 程式 (叫做 tdeioslave 或 "
+#~ "ioslave)。建議從 <a href=\"http://kde-apps.org/\">http://kde-apps.org/</"
+#~ "a> 和 <a href=\"http://freshmeat.net/\">http://freshmeat.net/</a> 這兩個地"
+#~ "方搜尋。"
diff --git a/tde-i18n-zh_TW/messages/tdelibs/tdeprint.po b/tde-i18n-zh_TW/messages/tdelibs/tdeprint.po
index 2e35c62242c..8a7360538c9 100644
--- a/tde-i18n-zh_TW/messages/tdelibs/tdeprint.po
+++ b/tde-i18n-zh_TW/messages/tdelibs/tdeprint.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeprint\n"
-"POT-Creation-Date: 2019-07-21 21:14+0200\n"
+"POT-Creation-Date: 2019-07-21 20:16+0200\n"
 "PO-Revision-Date: 2006-12-18 13:08+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -6044,46 +6044,6 @@ msgid "&PageMarks"
 msgstr "頁面標簽(&P)"
 
 #, fuzzy
-#~ msgid ""
-#~ " <qt>  <p><b>Margins</b></p>  <p>These settings control the margins of "
-#~ "printouts on the paper. They are not valid for  jobs originating from "
-#~ "applications which define their own page layout internally and  send "
-#~ "PostScript to TDEPrint (such as KOffice or OpenOffice.org). </p>  <p>When "
-#~ "printing from TDE applications, such as KMail and Konqueror, or printing "
-#~ "an ASCII text  file through kprinter, you can choose your preferred "
-#~ "margin settings here. </p>  <p>Margins may be set individually for each "
-#~ "edge of the paper. The combo box at the bottom lets you change  the units "
-#~ "of measurement between Pixels, Millimeters, Centimeters, and Inches. </"
-#~ "p>  <p>You can even use the mouse to grab one margin and drag it to the "
-#~ "intended position (see the  preview picture on the right side). </p>  "
-#~ "<hr>  <p><em><b>Additional hint for power users:</b> This TDEPrint GUI "
-#~ "element matches  with the CUPS commandline job option parameter:</em>  "
-#~ "<pre>     -o page-top=...      # example: \"72\"  <br>     -o page-"
-#~ "bottom=...   # example: \"24\"  <br>     -o page-left=...     # example: "
-#~ "\"36\"  <br>     -o page-right=...    # example: \"12\"  </pre> </p>  </"
-#~ "qt>"
-#~ msgstr ""
-#~ "<qt> <p><b>邊界</b></p> <p>這些設定控制列印輸出在紙張上的邊界留白大小。如"
-#~ "果是直接透過應用程式送來的列印工作，通常他們會定義自己的輸出版面，因此這個"
-#~ "設定會無效。</p> <p><p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS "
-#~ "命令列選項參數是一樣的： <pre>     -o page-top=...          # 例：\"72\"  "
-#~ "<br>      -o page-bottom=...     # 例：\"24\"  <br>     -o page-"
-#~ "left=...     # 例：\"36\"  <br>     -o page-right=...     # 例：\"12\"  "
-#~ "<br></pre></p></qt>"
-
-#, fuzzy
-#~ msgid ""
-#~ " <qt><b>Current Page:</b> Select <em>\"Current\"</em> if you want  to "
-#~ "print the page currently visible in your TDE application.</p> <p><b>Note:"
-#~ "</b> this field is disabled if you print from non-TDE applications like "
-#~ "Mozilla or OpenOffice.org, since here TDEPrint has no means to determine "
-#~ "which document page you are currently viewing.</p></qt>"
-#~ msgstr ""
-#~ "<qt><b>目前的頁面：</b>選擇「目前」則只印出目前您應用程式上觀看的那一頁。"
-#~ "</p> <p><b>注意：</b>如果您不是從 TDE 應用程式中列印，則這一欄會被關閉，因"
-#~ "為 TDEPrint 無法決定您目前在觀看文件的第幾頁。</p></qt>"
-
-#, fuzzy
 #~ msgid "Orientation"
 #~ msgstr "方向(&O)"
 
@@ -6147,3 +6107,43 @@ msgstr "頁面標簽(&P)"
 
 #~ msgid "Documentation"
 #~ msgstr "文件"
+
+#, fuzzy
+#~ msgid ""
+#~ " <qt>  <p><b>Margins</b></p>  <p>These settings control the margins of "
+#~ "printouts on the paper. They are not valid for  jobs originating from "
+#~ "applications which define their own page layout internally and  send "
+#~ "PostScript to TDEPrint (such as KOffice or OpenOffice.org). </p>  <p>When "
+#~ "printing from TDE applications, such as KMail and Konqueror, or printing "
+#~ "an ASCII text  file through kprinter, you can choose your preferred "
+#~ "margin settings here. </p>  <p>Margins may be set individually for each "
+#~ "edge of the paper. The combo box at the bottom lets you change  the units "
+#~ "of measurement between Pixels, Millimeters, Centimeters, and Inches. </"
+#~ "p>  <p>You can even use the mouse to grab one margin and drag it to the "
+#~ "intended position (see the  preview picture on the right side). </p>  "
+#~ "<hr>  <p><em><b>Additional hint for power users:</b> This TDEPrint GUI "
+#~ "element matches  with the CUPS commandline job option parameter:</em>  "
+#~ "<pre>     -o page-top=...      # example: \"72\"  <br>     -o page-"
+#~ "bottom=...   # example: \"24\"  <br>     -o page-left=...     # example: "
+#~ "\"36\"  <br>     -o page-right=...    # example: \"12\"  </pre> </p>  </"
+#~ "qt>"
+#~ msgstr ""
+#~ "<qt> <p><b>邊界</b></p> <p>這些設定控制列印輸出在紙張上的邊界留白大小。如"
+#~ "果是直接透過應用程式送來的列印工作，通常他們會定義自己的輸出版面，因此這個"
+#~ "設定會無效。</p> <p><p><b>進階使用者的額外提示：</b>這個選項與以下的 CUPS "
+#~ "命令列選項參數是一樣的： <pre>     -o page-top=...          # 例：\"72\"  "
+#~ "<br>      -o page-bottom=...     # 例：\"24\"  <br>     -o page-"
+#~ "left=...     # 例：\"36\"  <br>     -o page-right=...     # 例：\"12\"  "
+#~ "<br></pre></p></qt>"
+
+#, fuzzy
+#~ msgid ""
+#~ " <qt><b>Current Page:</b> Select <em>\"Current\"</em> if you want  to "
+#~ "print the page currently visible in your TDE application.</p> <p><b>Note:"
+#~ "</b> this field is disabled if you print from non-TDE applications like "
+#~ "Mozilla or OpenOffice.org, since here TDEPrint has no means to determine "
+#~ "which document page you are currently viewing.</p></qt>"
+#~ msgstr ""
+#~ "<qt><b>目前的頁面：</b>選擇「目前」則只印出目前您應用程式上觀看的那一頁。"
+#~ "</p> <p><b>注意：</b>如果您不是從 TDE 應用程式中列印，則這一欄會被關閉，因"
+#~ "為 TDEPrint 無法決定您目前在觀看文件的第幾頁。</p></qt>"