Merge translation files from master branch.

1 files changed, 51 insertions, 38 deletions

diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po b/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po
index 4680960422e..1eb16e16a82 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-01-13 18:46+0100\n"
+"POT-Creation-Date: 2019-07-21 21:14+0200\n"
 "PO-Revision-Date: 2005-05-17 00:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -1359,19 +1359,19 @@ 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>"
+"PostScript to TDEPrint (such as KOffice, OpenOffice or LibreOffice). </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 ""
 
 #: cups/kptextpage.cpp:134
@@ -1674,16 +1674,16 @@ msgstr ""
 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>"
+"field is disabled if you print from non-TDE applications like Firefox, "
+"PaleMoon, SeaMonkey or OpenOffice and LibreOffice, since here TDEPrint has "
+"no means to determine which document page you are currently viewing.</p></qt>"
 msgstr ""
 "<qt><b>当前页：</b><p>如果您想要打印在您的 TDE 应用程序中目前可见的一页，请选"
 "择<em>“当前页”</em>。</p><p><b>注意：</b>如果您从像 Mozilla 或 OpenOffice."
 "org 这样的非 TDE 应用程序中打印，此域将被禁用，因为 TDEPrint 无法确定您正在查"
 "看的是哪一页。</p></qt>"
 
-#: kpcopiespage.cpp:60
+#: kpcopiespage.cpp:61
 msgid ""
 " <qt><b>Page Range:</b> Choose a \"Page Range\" to select a subset of the "
 "complete document pages to be printed. The format is <em>\"n,m,o-p,q,r,s-t, u"
@@ -1699,7 +1699,7 @@ msgstr ""
 "b><em>“4,6,10-13,17,20,23-25”</em>将打印文档的第 4、6、10、11、12、13、17、"
 "20、23、24、25 页。</p></qt>"
 
-#: kpcopiespage.cpp:74
+#: kpcopiespage.cpp:75
 msgid ""
 " <qt><b>Page Set:</b> <p>Choose <em>\"All Pages\"</em>, <em>\"Even Pages\"</"
 "em> or <em>\"Odd Pages\"</em> if you want to print a page selection matching "
@@ -1727,7 +1727,7 @@ msgstr ""
 "项。您可能还需要在其中一次<em>“逆序”</em>输出纸张(取决于您的打印机型号)。</"
 "p></qt>"
 
-#: kpcopiespage.cpp:97
+#: kpcopiespage.cpp:98
 msgid ""
 " <qt><b>Output Settings:</b> Here you can determine the number of copies, "
 "the output order and the collate mode for the pages of your printjob. (Note, "
@@ -1740,7 +1740,7 @@ msgid ""
 "Collate=...           # example:  \"true\" or \"false\"  </pre> </p> .</qt>"
 msgstr ""
 
-#: kpcopiespage.cpp:115
+#: kpcopiespage.cpp:116
 msgid ""
 " <qt><b>Number of Copies:</b> Determine the number of requested copies here. "
 "You can increase or decrease the number of printed copies by clicking on the "
@@ -1755,7 +1755,7 @@ msgstr ""
 "TDEPrint GUI 元素可匹配 CUPS 命令行任务选项参数：</em><pre>     -o "
 "copies=...            # 例如“5”或“42”</pre></p></qt>"
 
-#: kpcopiespage.cpp:128
+#: kpcopiespage.cpp:129
 msgid ""
 " <qt><b>Collate Copies</b> <p>If the <em>\"Collate\"</em> checkbox is "
 "enabled (default), the output order for multiple copies of a multi-page "
@@ -1774,7 +1774,7 @@ msgstr ""
 "令行任务选项参数：</em><pre>    -o Collate=...           # 例"
 "如“true”或“false”</pre></p></qt>"
 
-#: kpcopiespage.cpp:142
+#: kpcopiespage.cpp:143
 msgid ""
 " <qt><b>Reverse Order</b> <p> If the <em>\"Reverse\"</em> checkbox is "
 "enabled, the output order for multiple copies of a multi-page document will "
@@ -1796,64 +1796,64 @@ msgstr ""
 "示：</b>此 TDEPrint GUI 元素可匹配 CUPS 命令行任务选项参数：</em><pre>    -o "
 "outputorder=...       # 例如“reverse”</pre></p></qt>"
 
-#: kpcopiespage.cpp:163
+#: kpcopiespage.cpp:164
 msgid "C&opies"
 msgstr "份数(&O)"
 
-#: kpcopiespage.cpp:167
+#: kpcopiespage.cpp:168
 msgid "Page Selection"
 msgstr "页面选择"
 
-#: kpcopiespage.cpp:169
+#: kpcopiespage.cpp:170
 msgid "&All"
 msgstr "全部(&A)"
 
-#: kpcopiespage.cpp:171
+#: kpcopiespage.cpp:172
 msgid "Cu&rrent"
 msgstr "当前页(&R)"
 
-#: kpcopiespage.cpp:173
+#: kpcopiespage.cpp:174
 msgid "Ran&ge"
 msgstr "范围(&G)"
 
-#: kpcopiespage.cpp:178
+#: kpcopiespage.cpp:179
 msgid ""
 "<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>"
 msgstr "<p>输入要打印的页号或页面组，以逗号分隔(1,2-5,8)。</p>"
 
-#: kpcopiespage.cpp:182
+#: kpcopiespage.cpp:183
 msgid "Output Settings"
 msgstr "输出设置"
 
-#: kpcopiespage.cpp:184
+#: kpcopiespage.cpp:185
 msgid "Co&llate"
 msgstr "逐份(&L)"
 
-#: kpcopiespage.cpp:186
+#: kpcopiespage.cpp:187
 msgid "Re&verse"
 msgstr "逆序(&V)"
 
-#: kpcopiespage.cpp:191
+#: kpcopiespage.cpp:192
 msgid "Cop&ies:"
 msgstr "份数(&I)："
 
-#: kpcopiespage.cpp:198
+#: kpcopiespage.cpp:199
 msgid "All Pages"
 msgstr "全部页面"
 
-#: kpcopiespage.cpp:199
+#: kpcopiespage.cpp:200
 msgid "Odd Pages"
 msgstr "奇数页"
 
-#: kpcopiespage.cpp:200
+#: kpcopiespage.cpp:201
 msgid "Even Pages"
 msgstr "偶数页"
 
-#: kpcopiespage.cpp:202
+#: kpcopiespage.cpp:203
 msgid "Page &set:"
 msgstr "页面集(&S)："
 
-#: kpcopiespage.cpp:257
+#: kpcopiespage.cpp:258
 msgid "Pages"
 msgstr "页面"
 
@@ -5706,6 +5706,19 @@ msgid "&PageMarks"
 msgstr "页标记(&P)"
 
 #, 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>如果您想要打印在您的 TDE 应用程序中目前可见的一页，"
+#~ "请选择<em>“当前页”</em>。</p><p><b>注意：</b>如果您从像 Mozilla 或 "
+#~ "OpenOffice.org 这样的非 TDE 应用程序中打印，此域将被禁用，因为 TDEPrint 无"
+#~ "法确定您正在查看的是哪一页。</p></qt>"
+
+#, fuzzy
 #~ msgid "Orientation"
 #~ msgstr "方向(&O)"