update translations for 6.4.0 Beta1 libreoffice-6-4-branch-point

and force-fix errors using pocheck

Change-Id: Ibdda3a07311750204fbd7bf07294c5217b8e9f49

1 files changed, 122 insertions, 110 deletions

diff --git a/source/zh-CN/sw/messages.po b/source/zh-CN/sw/messages.po
index d99108adffe..5ed9f59aae9 100644
--- a/source/zh-CN/sw/messages.po
+++ b/source/zh-CN/sw/messages.po
@@ -3,7 +3,7 @@ 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: 2019-11-08 19:34+0100\n"
+"POT-Creation-Date: 2019-11-13 13:47+0100\n"
 "PO-Revision-Date: 2019-08-20 10:21+0000\n"
 "Last-Translator: Dian LI <xslidian@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1960,54 +1960,54 @@ msgctxt "STR_JAVA_EDIT"
 msgid "Edit Script"
 msgstr "编辑脚本"
 
-#. GXGig
-#: sw/inc/strings.hrc:240
-msgctxt "STR_REMOVE_WARNING"
-msgid "The following characters are not valid and have been removed: "
-msgstr "下列字符无效，已被移除: "
-
 #. oBFxh
-#: sw/inc/strings.hrc:241
+#: sw/inc/strings.hrc:240
 msgctxt "STR_BOOKMARK_DEF_NAME"
 msgid "Bookmark"
 msgstr "书签"
 
 #. B6NAe
-#: sw/inc/strings.hrc:242
+#: sw/inc/strings.hrc:241
 msgctxt "STR_BOOKMARK_NAME"
 msgid "Name"
 msgstr "名称"
 
 #. CDMaA
-#: sw/inc/strings.hrc:243
+#: sw/inc/strings.hrc:242
 msgctxt "STR_BOOKMARK_TEXT"
 msgid "Text"
 msgstr "文本"
 
 #. GaCNW
-#: sw/inc/strings.hrc:244
+#: sw/inc/strings.hrc:243
 msgctxt "STR_BOOKMARK_HIDDEN"
 msgid "Hidden"
 msgstr "隐藏"
 
 #. Qz84t
-#: sw/inc/strings.hrc:245
+#: sw/inc/strings.hrc:244
 msgctxt "STR_BOOKMARK_CONDITION"
 msgid "Condition"
 msgstr "条件"
 
 #. QTQk5
-#: sw/inc/strings.hrc:246
+#: sw/inc/strings.hrc:245
 msgctxt "STR_BOOKMARK_YES"
 msgid "Yes"
 msgstr ""
 
 #. tvmJD
-#: sw/inc/strings.hrc:247
+#: sw/inc/strings.hrc:246
 msgctxt "STR_BOOKMARK_NO"
 msgid "No"
 msgstr ""
 
+#. DTBzh
+#: sw/inc/strings.hrc:247
+msgctxt "STR_BOOKMARK_FORBIDDENCHARS"
+msgid "Forbidden chars:"
+msgstr ""
+
 #. QEGSs
 #: sw/inc/strings.hrc:248
 msgctxt "SW_STR_NONE"
@@ -12341,67 +12341,79 @@ msgid "Bookmark"
 msgstr "书签"
 
 #. zocpL
-#: sw/uiconfig/swriter/ui/insertbookmark.ui:99
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:115
 msgctxt "insertbookmark|insert"
 msgid "Insert"
 msgstr "插入"
 
+#. 56gF6
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:132
+msgctxt "insertbookmark|name"
+msgid "Name:"
+msgstr ""
+
 #. LyrCp
-#: sw/uiconfig/swriter/ui/insertbookmark.ui:122
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:143
 msgctxt "insertbookmark|hide"
 msgid "H_ide"
 msgstr "隐藏(_I)"
 
-#. uDGFL
-#: sw/uiconfig/swriter/ui/insertbookmark.ui:145
+#. FCkPS
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:161
 msgctxt "insertbookmark|condlabel"
-msgid "_With condition"
-msgstr "带条件(_W)"
+msgid "_Condition:"
+msgstr ""
+
+#. ACcov
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:189
+msgctxt "insertbookmark|bookmarks"
+msgid "_Bookmarks:"
+msgstr ""
 
 #. XbAhB
-#: sw/uiconfig/swriter/ui/insertbookmark.ui:198
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:222
 msgctxt "insertbookmark|page"
 msgid "Page"
 msgstr "页面"
 
 #. gmKKz
-#: sw/uiconfig/swriter/ui/insertbookmark.ui:212
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:236
 msgctxt "insertbookmark|name"
 msgid "Name"
 msgstr "名称"
 
 #. fXQTX
-#: sw/uiconfig/swriter/ui/insertbookmark.ui:226
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:250
 msgctxt "insertbookmark|text"
 msgid "Text"
 msgstr "文字"
 
 #. ha65m
-#: sw/uiconfig/swriter/ui/insertbookmark.ui:240
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:264
 msgctxt "insertbookmark|hidden"
 msgid "Hidden"
 msgstr "隐藏"
 
 #. M7eFG
-#: sw/uiconfig/swriter/ui/insertbookmark.ui:254
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:278
 msgctxt "insertbookmark|condition"
 msgid "Condition"
 msgstr "条件"
 
 #. aZFEd
-#: sw/uiconfig/swriter/ui/insertbookmark.ui:280
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:323
 msgctxt "insertbookmark|goto"
 msgid "Go to"
 msgstr "转到"
 
 #. AfRGE
-#: sw/uiconfig/swriter/ui/insertbookmark.ui:294
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:337
 msgctxt "insertbookmark|delete"
 msgid "Delete"
 msgstr "删除"
 
 #. hvWfd
-#: sw/uiconfig/swriter/ui/insertbookmark.ui:308
+#: sw/uiconfig/swriter/ui/insertbookmark.ui:351
 msgctxt "insertbookmark|rename"
 msgid "Rename"
 msgstr "重命名"
@@ -13193,53 +13205,53 @@ msgid "Send replies to _different email address"
 msgstr "将回复发送到不同的电子邮件地址(_D)"
 
 #. AESca
-#: sw/uiconfig/swriter/ui/mailconfigpage.ui:125
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:124
 msgctxt "mailconfigpage|replyto_label"
 msgid "_Reply address:"
 msgstr "回复地址(_R):"
 
 #. 5KJrn
-#: sw/uiconfig/swriter/ui/mailconfigpage.ui:142
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:144
 msgctxt "mailconfigpage|label1"
 msgid "User Information"
 msgstr "用户信息"
 
-#. RihCy
-#: sw/uiconfig/swriter/ui/mailconfigpage.ui:178
-msgctxt "mailconfigpage|secure"
-msgid "_Use secure connection (SSL)"
-msgstr "使用安全连接 (SSL) (_U)"
+#. zeoLy
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:200
+msgctxt "mailconfigpage|serverauthentication"
+msgid "Ser_ver Authentication…"
+msgstr "服务器认证(_V)…"
 
 #. UU5RG
-#: sw/uiconfig/swriter/ui/mailconfigpage.ui:215
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:236
 msgctxt "mailconfigpage|server_label"
 msgid "_Server name:"
 msgstr "服务器名称(_S):"
 
 #. BNGrw
-#: sw/uiconfig/swriter/ui/mailconfigpage.ui:229
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:250
 msgctxt "mailconfigpage|port_label"
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#. zeoLy
-#: sw/uiconfig/swriter/ui/mailconfigpage.ui:266
-msgctxt "mailconfigpage|serverauthentication"
-msgid "Ser_ver Authentication…"
-msgstr "服务器认证(_V)…"
-
-#. msmFF
-#: sw/uiconfig/swriter/ui/mailconfigpage.ui:292
-msgctxt "mailconfigpage|label2"
-msgid "Outgoing Server (SMTP) Settings"
-msgstr "发送服务器 (SMTP) 设置"
+#. RihCy
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:261
+msgctxt "mailconfigpage|secure"
+msgid "_Use secure connection (SSL)"
+msgstr "使用安全连接 (SSL) (_U)"
 
 #. U82eq
-#: sw/uiconfig/swriter/ui/mailconfigpage.ui:314
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:285
 msgctxt "mailconfigpage|test"
 msgid "_Test Settings"
 msgstr "测试设置 (_T)"
 
+#. msmFF
+#: sw/uiconfig/swriter/ui/mailconfigpage.ui:317
+msgctxt "mailconfigpage|label2"
+msgid "Outgoing Server (SMTP) Settings"
+msgstr "发送服务器 (SMTP) 设置"
+
 #. RyDB6
 #: sw/uiconfig/swriter/ui/mailmerge.ui:16
 msgctxt "mailmerge|MailmergeDialog"
@@ -15970,19 +15982,19 @@ msgstr ""
 "自动添加题注:"
 
 #. kUskc
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:547
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:546
 msgctxt "optcaptionpage|captionorder"
 msgid "Category first"
 msgstr "类别优先"
 
 #. AiEA9
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:548
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:547
 msgctxt "optcaptionpage|captionorder"
 msgid "Numbering first"
 msgstr "编号优先"
 
 #. gB7ua
-#: sw/uiconfig/swriter/ui/optcaptionpage.ui:558
+#: sw/uiconfig/swriter/ui/optcaptionpage.ui:557
 msgctxt "optcaptionpage|label13"
 msgid "Caption Order"
 msgstr "标题顺序"
@@ -16329,98 +16341,98 @@ msgctxt "optformataidspage|cursoropt"
 msgid "Protected Areas"
 msgstr "受保护区域"
 
+#. V9Ahc
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:46
+msgctxt "optgeneralpage|updatefields"
+msgid "_Fields"
+msgstr "字段(_F)"
+
+#. gGD6o
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:61
+msgctxt "optgeneralpage|updatecharts"
+msgid "_Charts"
+msgstr "图表(_C)"
+
+#. GfsZW
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:82
+msgctxt "optgeneralpage|label2"
+msgid "Automatically Update"
+msgstr "自动更新"
+
 #. CD9es
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:59
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:115
 msgctxt "optgeneralpage|always"
 msgid "_Always"
 msgstr "总是(_A)"
 
 #. UAGDA
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:75
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:131
 msgctxt "optgeneralpage|onrequest"
 msgid "_On request"
 msgstr "在请求时(_O)"
 
 #. sbk3q
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:91
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:147
 msgctxt "optgeneralpage|never"
 msgid "_Never"
 msgstr "从不(_N)"
 
 #. 7WCku
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:113
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:169
 msgctxt "optgeneralpage|label1"
 msgid "Update Links when Loading"
 msgstr "载入时更新链接"
 
-#. V9Ahc
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:145
-msgctxt "optgeneralpage|updatefields"
-msgid "_Fields"
-msgstr "字段(_F)"
-
-#. gGD6o
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:160
-msgctxt "optgeneralpage|updatecharts"
-msgid "_Charts"
-msgstr "图表(_C)"
-
-#. GfsZW
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:181
-msgctxt "optgeneralpage|label2"
-msgid "Automatically Update"
-msgstr "自动更新"
-
 #. BnMCi
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:226
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:209
 msgctxt "optgeneralpage|label5"
 msgid "_Measurement unit:"
 msgstr "度量单位(_M):"
 
 #. TjFaE
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:251
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:233
 msgctxt "optgeneralpage|tablabel"
 msgid "_Tab stops:"
 msgstr "制表位(_T):"
 
 #. 4c98s
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:290
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:272
 msgctxt "optgeneralpage|usecharunit"
 msgid "_Enable char unit"
 msgstr "启用字符单位(_E)"
 
 #. Ktgd2
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:306
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:288
 msgctxt "optgeneralpage|squaremode"
 msgid "_Use square page mode for text grid"
 msgstr "文字网格使用方格页面模式(_U)"
 
 #. BCtAD
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:334
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:316
 msgctxt "optgeneralpage|label3"
 msgid "Settings"
 msgstr "设置"
 
 #. PdMCE
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:376
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:359
 msgctxt "optgeneralpage|label7"
 msgid "_Additional separators:"
 msgstr "其它分隔符(_A):"
 
 #. 9pDAg
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:411
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:393
 msgctxt "optgeneralpage|standardizedpageshow"
 msgid "Show standardized page count"
 msgstr "显示标准页面字符计数"
 
 #. qJ4Fr
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:438
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:420
 msgctxt "optgeneralpage|labelstandardpages"
 msgid "Characters per standardized page:"
 msgstr "每标准页面的字符数:"
 
 #. dgznZ
-#: sw/uiconfig/swriter/ui/optgeneralpage.ui:485
+#: sw/uiconfig/swriter/ui/optgeneralpage.ui:467
 msgctxt "optgeneralpage|label4"
 msgid "Word Count"
 msgstr "字词统计"
@@ -17762,133 +17774,133 @@ msgid "is being prepared for printing on"
 msgstr "正准备从下列位置打印"
 
 #. xxmtW
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:37
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:36
 msgctxt "printoptionspage|graphics"
 msgid "_Images and objects"
 msgstr "图像和对象 (_I)"
 
 #. YXZkf
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:52
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:51
 msgctxt "printoptionspage|formcontrols"
 msgid "Form control_s"
 msgstr "表单控件(_S)"
 
 #. Etckm
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:67
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:66
 msgctxt "printoptionspage|background"
 msgid "Page ba_ckground"
 msgstr "页面背景(_C)"
 
 #. FWBUe
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:82
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:81
 msgctxt "printoptionspage|inblack"
 msgid "Print text in blac_k"
 msgstr "将文本打印为黑色(_K)"
 
 #. EhvUm
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:97
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:96
 msgctxt "printoptionspage|hiddentext"
 msgid "Hidden te_xt"
 msgstr "隐藏的文字(_X)"
 
 #. AkeAw
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:112
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:111
 msgctxt "printoptionspage|textplaceholder"
 msgid "Text _placeholder"
 msgstr "文字占位符(_P)"
 
 #. nxmuA
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:133
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:132
 msgctxt "printoptionspage|label2"
 msgid "Contents"
 msgstr "内容"
 
 #. UdKAr
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:165
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:163
 msgctxt "printoptionspage|leftpages"
 msgid "_Left pages"
 msgstr "偶数页(_L)"
 
 #. UpodC
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:180
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:178
 msgctxt "printoptionspage|rightpages"
 msgid "_Right pages"
 msgstr "奇数页(_R)"
 
 #. yWvNR
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:195
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:193
 msgctxt "printoptionspage|brochure"
 msgid "Broch_ure"
 msgstr "小手册(_U)"
 
 #. knHGC
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:210
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:208
 msgctxt "printoptionspage|rtl"
 msgid "Right to Left"
 msgstr "从右向左"
 
 #. QTzam
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:232
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:230
 msgctxt "printoptionspage|label10"
 msgid "Pages"
 msgstr "页面"
 
 #. 6C24R
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:263
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:261
 msgctxt "printoptionspage|none"
 msgid "_None"
 msgstr "无(_N)"
 
 #. 6vPTt
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:279
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:277
 msgctxt "printoptionspage|only"
 msgid "Comments _only"
 msgstr "仅批注(_O)"
 
 #. n5M2U
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:295
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:293
 msgctxt "printoptionspage|end"
 msgid "End of docu_ment"
 msgstr "在文档的结尾(_M)"
 
 #. pRqdi
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:311
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:309
 msgctxt "printoptionspage|endpage"
 msgid "_End of page"
 msgstr "在页面的结尾(_E)"
 
 #. oBR83
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:327
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:325
 msgctxt "printoptionspage|inmargins"
 msgid "In margins"
 msgstr "在边距内"
 
 #. VeG6V
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:349
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:347
 msgctxt "printoptionspage|4"
 msgid "Comments"
 msgstr "批注"
 
 #. hWKii
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:394
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:395
 msgctxt "printoptionspage|label5"
 msgid "_Fax"
 msgstr "传真(_F)"
 
 #. HCEJQ
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:421
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:422
 msgctxt "printoptionspage|blankpages"
 msgid "Print _automatically inserted blank pages"
 msgstr "打印自动插入的空白页(_A)"
 
 #. oSYKd
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:436
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:437
 msgctxt "printoptionspage|papertray"
 msgid "_Paper tray from printer settings"
 msgstr "使用打印机的纸张托盘设置(_P)"
 
 #. XdcEh
-#: sw/uiconfig/swriter/ui/printoptionspage.ui:457
+#: sw/uiconfig/swriter/ui/printoptionspage.ui:458
 msgctxt "printoptionspage|label1"
 msgid "Other"
 msgstr "其他"
@@ -19308,31 +19320,31 @@ msgid "Table Properties"
 msgstr "表格属性"
 
 #. 4jHAN
-#: sw/uiconfig/swriter/ui/tableproperties.ui:135
+#: sw/uiconfig/swriter/ui/tableproperties.ui:136
 msgctxt "tableproperties|table"
 msgid "Table"
 msgstr "表格"
 
 #. PgyPz
-#: sw/uiconfig/swriter/ui/tableproperties.ui:181
+#: sw/uiconfig/swriter/ui/tableproperties.ui:182
 msgctxt "tableproperties|textflow"
 msgid "Text Flow"
 msgstr "文字流"
 
 #. ADSBP
-#: sw/uiconfig/swriter/ui/tableproperties.ui:228
+#: sw/uiconfig/swriter/ui/tableproperties.ui:229
 msgctxt "tableproperties|columns"
 msgid "Columns"
 msgstr "表格列"
 
 #. BFWgV
-#: sw/uiconfig/swriter/ui/tableproperties.ui:275
+#: sw/uiconfig/swriter/ui/tableproperties.ui:276
 msgctxt "tableproperties|borders"
 msgid "Borders"
 msgstr "边框"
 
 #. AJTd2
-#: sw/uiconfig/swriter/ui/tableproperties.ui:322
+#: sw/uiconfig/swriter/ui/tableproperties.ui:323
 msgctxt "tableproperties|background"
 msgid "Background"
 msgstr "背景"