update translations for master

and force-fix errors using pocheck

Change-Id: Iba2b940b559a295467b1a9e77ef87cadb24633e7

1 files changed, 68 insertions, 50 deletions

diff --git a/source/zh-CN/vcl/messages.po b/source/zh-CN/vcl/messages.po
index 78fe62e1b8a..ea049c3db4e 100644
--- a/source/zh-CN/vcl/messages.po
+++ b/source/zh-CN/vcl/messages.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-06-08 14:52+0200\n"
-"PO-Revision-Date: 2020-06-02 11:48+0000\n"
+"POT-Creation-Date: 2020-07-27 13:25+0200\n"
+"PO-Revision-Date: 2020-07-24 04:34+0000\n"
 "Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
 "Language-Team: Chinese (Simplified) <https://weblate.documentfoundation.org/projects/libo_ui-master/vclmessages/zh_Hans/>\n"
 "Language: zh-CN\n"
@@ -1204,6 +1204,12 @@ msgctxt "STR_WIZDLG_PREVIOUS"
 msgid "< Bac~k"
 msgstr "< 后退(~K)"
 
+#. urFMt
+#: vcl/inc/strings.hrc:156
+msgctxt "STR_SEPARATOR"
+msgid "Separator"
+msgstr "分隔符"
+
 #. V2EuY
 #. To translators: This is the first entry of a sequence of measurement unit names
 #: vcl/inc/units.hrc:28
@@ -2061,230 +2067,242 @@ msgctxt "printdialog|pagerange"
 msgid "e.g.: 1, 3-5, 7, 9"
 msgstr "如: 1, 3-5, 7, 9"
 
-#. V3apS
-#: vcl/uiconfig/ui/printdialog.ui:544
-msgctxt "printdialog|rmEvenPages"
-msgid "_Even pages"
-msgstr "偶数页面(_E)"
-
-#. ELsCF
-#: vcl/uiconfig/ui/printdialog.ui:563
-msgctxt "printdialog|rbOddPages"
-msgid "_Odd pages"
-msgstr "奇数页面(_O)"
-
 #. Z5kiB
-#: vcl/uiconfig/ui/printdialog.ui:582
+#: vcl/uiconfig/ui/printdialog.ui:544
 msgctxt "printdialog|rbRangeSelection"
 msgid "_Selection"
 msgstr "选中内容(_S)"
 
+#. UKYwM
+#: vcl/uiconfig/ui/printdialog.ui:564
+msgctxt "printdialog|includeevenodd"
+msgid "Include:"
+msgstr ""
+
+#. XmeFL
+#: vcl/uiconfig/ui/printdialog.ui:580
+msgctxt "printdialog|liststore3"
+msgid "Odd and Even Pages"
+msgstr ""
+
+#. 49y67
+#: vcl/uiconfig/ui/printdialog.ui:581
+msgctxt "printdialog|liststore3"
+msgid "Odd Pages"
+msgstr ""
+
+#. 6CkPE
+#: vcl/uiconfig/ui/printdialog.ui:582
+msgctxt "printdialog|liststore3"
+msgid "Even Pages"
+msgstr ""
+
 #. wn2kB
-#: vcl/uiconfig/ui/printdialog.ui:618
+#: vcl/uiconfig/ui/printdialog.ui:611
 msgctxt "printdialog|fromwhich"
 msgid "_From which print:"
 msgstr "打印起始于(_F):"
 
 #. Cuc2u
-#: vcl/uiconfig/ui/printdialog.ui:642
+#: vcl/uiconfig/ui/printdialog.ui:635
 msgctxt "printdialog|labelpapersides"
 msgid "Paper _sides:"
 msgstr "纸张单双面(_S):"
 
 #. SYxRJ
-#: vcl/uiconfig/ui/printdialog.ui:657
+#: vcl/uiconfig/ui/printdialog.ui:650
 msgctxt "printdialog|liststore4"
 msgid "Print on one side (simplex)"
 msgstr "单面打印"
 
 #. hCZPg
-#: vcl/uiconfig/ui/printdialog.ui:658
+#: vcl/uiconfig/ui/printdialog.ui:651
 msgctxt "printdialog|liststore4"
 msgid "Print on both sides (duplex long edge)"
 msgstr "双面打印（长边翻页）"
 
 #. iqr9C
-#: vcl/uiconfig/ui/printdialog.ui:659
+#: vcl/uiconfig/ui/printdialog.ui:652
 msgctxt "printdialog|liststore4"
 msgid "Print on both sides (duplex short edge)"
 msgstr "双面打印（短边翻页）"
 
 #. AVv6D
-#: vcl/uiconfig/ui/printdialog.ui:672
+#: vcl/uiconfig/ui/printdialog.ui:665
 msgctxt "printdialog|labelcopies"
 msgid "_Number of copies:"
 msgstr "副本数(_N):"
 
 #. BT4nY
-#: vcl/uiconfig/ui/printdialog.ui:702
+#: vcl/uiconfig/ui/printdialog.ui:695
 msgctxt "printdialog|cbPrintOrder"
 msgid "Order:"
 msgstr "顺序:"
 
 #. vwjVt
-#: vcl/uiconfig/ui/printdialog.ui:714
+#: vcl/uiconfig/ui/printdialog.ui:707
 msgctxt "printdialog|reverseorder"
 msgid "Print in _reverse order"
 msgstr "逆序打印(_R)"
 
 #. G6QEr
-#: vcl/uiconfig/ui/printdialog.ui:735
+#: vcl/uiconfig/ui/printdialog.ui:728
 msgctxt "printdialog|collate"
 msgid "_Collate"
 msgstr "排列(_C)"
 
 #. R82MM
-#: vcl/uiconfig/ui/printdialog.ui:775
+#: vcl/uiconfig/ui/printdialog.ui:768
 msgctxt "printdialog|rangeexpander"
 msgid "_more"
 msgstr "更多设置(_M)"
 
 #. ehfCG
-#: vcl/uiconfig/ui/printdialog.ui:793
+#: vcl/uiconfig/ui/printdialog.ui:786
 msgctxt "printdialog|label2"
 msgid "Range and Copies"
 msgstr "范围与份数"
 
 #. CBLet
-#: vcl/uiconfig/ui/printdialog.ui:834
+#: vcl/uiconfig/ui/printdialog.ui:827
 msgctxt "printdialog|labelorientation"
 msgid "Orientation:"
 msgstr "方向:"
 
 #. U4byk
-#: vcl/uiconfig/ui/printdialog.ui:848
+#: vcl/uiconfig/ui/printdialog.ui:841
 msgctxt "printdialog|labelsize"
 msgid "Paper size:"
 msgstr "纸张大小:"
 
 #. X9iBj
-#: vcl/uiconfig/ui/printdialog.ui:864
+#: vcl/uiconfig/ui/printdialog.ui:857
 msgctxt "printdialog|liststore3"
 msgid "Automatic"
 msgstr "自动"
 
 #. vaWZE
-#: vcl/uiconfig/ui/printdialog.ui:865
+#: vcl/uiconfig/ui/printdialog.ui:858
 msgctxt "printdialog|liststore3"
 msgid "Portrait"
 msgstr "纵向"
 
 #. Qnpje
-#: vcl/uiconfig/ui/printdialog.ui:866
+#: vcl/uiconfig/ui/printdialog.ui:859
 msgctxt "printdialog|liststore3"
 msgid "Landscape"
 msgstr "横向"
 
 #. EZdsx
-#: vcl/uiconfig/ui/printdialog.ui:909
+#: vcl/uiconfig/ui/printdialog.ui:902
 msgctxt "printdialog|pagespersheetbtn"
 msgid "Pages per sheet:"
 msgstr "每张纸打印页数:"
 
 #. DKP5g
-#: vcl/uiconfig/ui/printdialog.ui:957
+#: vcl/uiconfig/ui/printdialog.ui:950
 msgctxt "printdialog|liststore1"
 msgid "Custom"
 msgstr "自定义"
 
 #. 65WWt
-#: vcl/uiconfig/ui/printdialog.ui:973
+#: vcl/uiconfig/ui/printdialog.ui:966
 msgctxt "printdialog|pagespersheettxt"
 msgid "Pages:"
 msgstr "页面:"
 
 #. DM5aX
-#: vcl/uiconfig/ui/printdialog.ui:998
+#: vcl/uiconfig/ui/printdialog.ui:991
 msgctxt "printdialog|by"
 msgid "by"
 msgstr "按"
 
 #. szcD7
-#: vcl/uiconfig/ui/printdialog.ui:1024
+#: vcl/uiconfig/ui/printdialog.ui:1017
 msgctxt "printdialog|pagemargintxt1"
 msgid "Margin:"
 msgstr "边距:"
 
 #. iGg2m
-#: vcl/uiconfig/ui/printdialog.ui:1049
+#: vcl/uiconfig/ui/printdialog.ui:1042
 msgctxt "printdialog|pagemargintxt2"
 msgid "between pages"
 msgstr "页面之间"
 
 #. oryuw
-#: vcl/uiconfig/ui/printdialog.ui:1061
+#: vcl/uiconfig/ui/printdialog.ui:1054
 msgctxt "printdialog|sheetmargintxt1"
 msgid "Distance:"
 msgstr "距离:"
 
 #. XhfvB
-#: vcl/uiconfig/ui/printdialog.ui:1086
+#: vcl/uiconfig/ui/printdialog.ui:1079
 msgctxt "printdialog|sheetmargintxt2"
 msgid "to sheet border"
 msgstr "到纸张边沿"
 
 #. AGWe3
-#: vcl/uiconfig/ui/printdialog.ui:1099
+#: vcl/uiconfig/ui/printdialog.ui:1092
 msgctxt "printdialog|labelorder"
 msgid "Order:"
 msgstr "顺序:"
 
 #. psAku
-#: vcl/uiconfig/ui/printdialog.ui:1114
+#: vcl/uiconfig/ui/printdialog.ui:1107
 msgctxt "printdialog|liststore2"
 msgid "Left to right, then down"
 msgstr "从左往右，再往下"
 
 #. fnfLt
-#: vcl/uiconfig/ui/printdialog.ui:1115
+#: vcl/uiconfig/ui/printdialog.ui:1108
 msgctxt "printdialog|liststore2"
 msgid "Top to bottom, then right"
 msgstr "从上往下，再往右"
 
 #. y6nZE
-#: vcl/uiconfig/ui/printdialog.ui:1116
+#: vcl/uiconfig/ui/printdialog.ui:1109
 msgctxt "printdialog|liststore2"
 msgid "Top to bottom, then left"
 msgstr "从上往下，再往左"
 
 #. PteTg
-#: vcl/uiconfig/ui/printdialog.ui:1117
+#: vcl/uiconfig/ui/printdialog.ui:1110
 msgctxt "printdialog|liststore2"
 msgid "Right to left, then down"
 msgstr "从右往左，再往下"
 
 #. QG59F
-#: vcl/uiconfig/ui/printdialog.ui:1128
+#: vcl/uiconfig/ui/printdialog.ui:1121
 msgctxt "printdialog|bordercb"
 msgid "Draw a border around each page"
 msgstr "每页绘制一个边框"
 
 #. Yo4xV
-#: vcl/uiconfig/ui/printdialog.ui:1144
+#: vcl/uiconfig/ui/printdialog.ui:1137
 msgctxt "printdialog|brochure"
 msgid "Brochure"
 msgstr "小册子"
 
 #. JMA7A
-#: vcl/uiconfig/ui/printdialog.ui:1172
+#: vcl/uiconfig/ui/printdialog.ui:1165
 msgctxt "printdialog|collationpreview"
 msgid "Collation preview"
 msgstr "排列预览"
 
 #. bF4up
-#: vcl/uiconfig/ui/printdialog.ui:1194
+#: vcl/uiconfig/ui/printdialog.ui:1187
 msgctxt "printdialog|layoutexpander"
 msgid "m_ore"
 msgstr "更多设置(_O)"
 
 #. rCBA5
-#: vcl/uiconfig/ui/printdialog.ui:1212
+#: vcl/uiconfig/ui/printdialog.ui:1205
 msgctxt "printdialog|label3"
 msgid "Page Layout"
 msgstr "页面布局"
 
 #. A2iC5
-#: vcl/uiconfig/ui/printdialog.ui:1235
+#: vcl/uiconfig/ui/printdialog.ui:1228
 msgctxt "printdialog|generallabel"
 msgid "General"
 msgstr "常规"