update translations for master

and force-fix errors using pocheck

Change-Id: Iba2b940b559a295467b1a9e77ef87cadb24633e7

1 files changed, 341 insertions, 137 deletions

diff --git a/source/zh-CN/sw/messages.po b/source/zh-CN/sw/messages.po
index 649ddea8914..a8a22be698e 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: 2020-06-29 13:09+0200\n"
+"POT-Creation-Date: 2020-07-27 13:25+0200\n"
 "PO-Revision-Date: 2020-06-01 04:10+0000\n"
 "Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
 "Language-Team: Chinese (Simplified) <https://weblate.documentfoundation.org/projects/libo_ui-master/swmessages/zh_Hans/>\n"
@@ -6567,17 +6567,17 @@ msgctxt "STR_NO_HEADER"
 msgid "No header"
 msgstr "无页眉"
 
-#. Zm8cr
+#. 8Jgfg
 #: sw/inc/strings.hrc:1076
 msgctxt "STR_SURROUND_IDEAL"
-msgid "Optimal wrap"
-msgstr "最佳环绕"
+msgid "Optimal"
+msgstr ""
 
-#. whxC3
+#. HEuGy
 #: sw/inc/strings.hrc:1077
 msgctxt "STR_SURROUND_NONE"
-msgid "No wrap"
-msgstr "无环绕"
+msgid "None"
+msgstr ""
 
 #. 4tA4q
 #: sw/inc/strings.hrc:1078
@@ -6585,23 +6585,23 @@ msgctxt "STR_SURROUND_THROUGH"
 msgid "Through"
 msgstr "贯穿"
 
-#. gS6sZ
+#. ypvD6
 #: sw/inc/strings.hrc:1079
 msgctxt "STR_SURROUND_PARALLEL"
-msgid "Parallel wrap"
-msgstr "平行环绕"
+msgid "Parallel"
+msgstr ""
 
-#. tmVqi
+#. hyEQ5
 #: sw/inc/strings.hrc:1080
 msgctxt "STR_SURROUND_LEFT"
-msgid "Left wrap"
-msgstr "左环绕"
+msgid "Before"
+msgstr ""
 
-#. 3tBBF
+#. bGBtQ
 #: sw/inc/strings.hrc:1081
 msgctxt "STR_SURROUND_RIGHT"
-msgid "Right wrap"
-msgstr "右环绕"
+msgid "After"
+msgstr ""
 
 #. SrG3D
 #: sw/inc/strings.hrc:1082
@@ -9046,31 +9046,31 @@ msgid "Customize"
 msgstr "自定义"
 
 #. rK9Jk
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:30
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:29
 msgctxt "businessdatapage|label5"
 msgid "Company:"
 msgstr "公司名称:"
 
 #. MnnUx
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:44
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:43
 msgctxt "businessdatapage|streetft"
 msgid "Slogan:"
 msgstr "口号:"
 
 #. AgVpM
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:58
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:57
 msgctxt "businessdatapage|countryft"
 msgid "Co_untry/state:"
 msgstr "国家/州(_U):"
 
 #. E22ms
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:72
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:71
 msgctxt "businessdatapage|label8"
 msgid "Position:"
 msgstr "职位:"
 
 #. F7gdj
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:86
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:85
 msgctxt "businessdatapage|phoneft"
 msgid "Fa_x:"
 msgstr "传真(_X):"
@@ -9082,7 +9082,7 @@ msgid "Home telephone number"
 msgstr "家庭电话号码"
 
 #. KJFn7
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:105
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:104
 msgctxt "businessdatapage|faxft"
 msgid "Homepage/email:"
 msgstr "主页/电子邮件:"
@@ -9093,86 +9093,170 @@ msgctxt "businessdatapage|company-atkobject"
 msgid "First name"
 msgstr "名字"
 
+#. Lw69w
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:128
+msgctxt "extended tip | company"
+msgid "Type the name of your company in this field."
+msgstr ""
+
 #. 7PLeB
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:156
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:157
 msgctxt "businessdatapage|position-atkobject"
 msgid "Title"
 msgstr "头衔"
 
+#. QGc4K
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:158
+msgctxt "extended tip | position"
+msgid "Type your position in the company in this field."
+msgstr ""
+
 #. KckUP
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:184
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:186
 msgctxt "businessdatapage|fax-atkobject"
 msgid "Home telephone number"
 msgstr "家庭电话"
 
+#. hCy4G
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:187
+msgctxt "extended tip | fax"
+msgid "Type company fax number in this field."
+msgstr ""
+
 #. iGBqW
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:214
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:217
 msgctxt "businessdatapage|url-atkobject"
 msgid "Fax number"
 msgstr "传真号码"
 
+#. RshDE
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:218
+msgctxt "extended tips | url"
+msgid "Company homepage"
+msgstr ""
+
 #. JBxqb
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:231
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:235
 msgctxt "businessdatapage|email-atkobject"
 msgid "email address"
 msgstr "电子邮件地址"
 
+#. QQLEZ
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:236
+msgctxt "extended tip | email"
+msgid "Type your company e-mail address."
+msgstr ""
+
 #. CCKWa
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:251
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:255
 msgctxt "businessdatapage|eastnameft"
 msgid "Company 2nd line:"
 msgstr "公司名称第二行:"
 
 #. EFGLj
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:273
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:278
 msgctxt "businessdatapage|company2-atkobject"
 msgid "Last name"
 msgstr "姓"
 
+#. MrShX
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:279
+msgctxt "extended tips | company2"
+msgid "Company second line"
+msgstr ""
+
 #. Po3B3
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:293
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:298
 msgctxt "businessdatapage|icityft"
 msgid "_Zip/city:"
 msgstr "邮编/城市(_Z):"
 
 #. sZyRB
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:315
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:321
 msgctxt "businessdatapage|icity-atkobject"
 msgid "City"
 msgstr "城市"
 
+#. tD9Hi
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:322
+msgctxt "extended tip | icity"
+msgid "Type the company city"
+msgstr ""
+
 #. ytCQe
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:332
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:339
 msgctxt "businessdatapage|izip-atkobject"
 msgid "Zip code"
 msgstr "邮政编码"
 
+#. K9T4A
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:340
+msgctxt "extended tip | izip"
+msgid "Type company ZIP in this field."
+msgstr ""
+
+#. iVLAA
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:368
+msgctxt "extended tips | slogan"
+msgid "Company slogan"
+msgstr ""
+
+#. GAi2c
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:397
+msgctxt "extended tips | country"
+msgid "Company country"
+msgstr ""
+
+#. ZFNQd
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:414
+msgctxt "extended tip | state"
+msgid "Type company state."
+msgstr ""
+
 #. yvuE2
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:411
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:433
 msgctxt "businessdatapage|titleft1"
 msgid "Phone/mobile:"
 msgstr "电话/手机:"
 
 #. jNfw4
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:434
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:457
 msgctxt "businessdatapage|phone-atkobject"
 msgid "Title"
 msgstr "头衔"
 
+#. Cbfw6
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:458
+msgctxt "extended tips | phone"
+msgid "Type business phone"
+msgstr ""
+
 #. BGbZN
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:451
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:475
 msgctxt "businessdatapage|mobile-atkobject"
 msgid "Position"
 msgstr "职位"
 
+#. ppLsf
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:476
+msgctxt "extended tips | mobile"
+msgid "Type company mobile"
+msgstr ""
+
 #. 9TjDF
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:471
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:495
 msgctxt "businessdatapage|streetft1"
 msgid "Street:"
 msgstr "街道:"
 
+#. A4FvA
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:518
+msgctxt "extended tip | street"
+msgid "Type the name of company street in this field."
+msgstr ""
+
 #. RTBTC
-#: sw/uiconfig/swriter/ui/businessdatapage.ui:511
+#: sw/uiconfig/swriter/ui/businessdatapage.ui:541
 msgctxt "businessdatapage|label1"
 msgid "Business Data"
 msgstr "商务数据"
@@ -14168,109 +14252,121 @@ msgid "What Type of Document Do You Want to Create?"
 msgstr "您要创建哪种类型的文档？"
 
 #. 4jmu8
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:18
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:19
 msgctxt "mmresultemaildialog|MMResultEmailDialog"
 msgid "Email merged document"
 msgstr "将已合并的文档通过电子邮件发送"
 
 #. gT9YY
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:37
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:38
 msgctxt "mmresultemaildialog|ok"
 msgid "Send Documents"
 msgstr "发送文档"
 
 #. cNmQk
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:118
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:119
 msgctxt "mmresultemaildialog|mailtoft"
 msgid "T_o"
 msgstr "收件人 (_O)"
 
 #. H6VrM
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:141
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:142
 msgctxt "mmresultemaildialog|copyto"
 msgid "_Copy to..."
 msgstr "抄送 (_C)..."
 
 #. HAvs3
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:156
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:157
 msgctxt "mmresultemaildialog|subjectft"
 msgid "S_ubject"
 msgstr "主题 (_U)"
 
 #. DRHXR
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:182
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:183
 msgctxt "mmresultemaildialog|sendasft"
 msgid "Sen_d as"
 msgstr "发送格式 (_D)"
 
 #. FUKtT
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:198
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:199
 msgctxt "mmresultemaildialog|liststore1"
 msgid "OpenDocument Text"
 msgstr "OpenDocument 文本文档"
 
 #. MUQ4h
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:199
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:200
 msgctxt "mmresultemaildialog|liststore1"
 msgid "Adobe PDF-Document"
 msgstr "Adobe PDF 文档"
 
 #. LpGGz
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:200
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:201
 msgctxt "mmresultemaildialog|liststore1"
 msgid "Microsoft Word Document"
 msgstr "Microsoft Word 文档"
 
 #. xSrmF
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:201
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:202
 msgctxt "mmresultemaildialog|liststore1"
 msgid "HTML Message"
 msgstr "HTML 消息"
 
 #. eCCZz
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:202
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:203
 msgctxt "mmresultemaildialog|liststore1"
 msgid "Plain Text"
 msgstr "纯文本"
 
 #. A25u6
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:212
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:213
 msgctxt "mmresultemaildialog|sendassettings"
 msgid "Pr_operties..."
 msgstr "属性 (_O)..."
 
+#. TePCV
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:229
+msgctxt "mmresultemaildialog|passwordft"
+msgid "Password"
+msgstr ""
+
+#. AEF8w
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:252
+msgctxt "mmresultemaildialog|passwordcb"
+msgid "Save with password"
+msgstr ""
+
 #. Z6zpg
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:258
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:304
 msgctxt "mmresultemaildialog|attachft"
 msgid "Name of the a_ttachment"
 msgstr "附件名称 (_T)"
 
 #. xx2Kz
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:278
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:324
 msgctxt "mmresultemaildialog|label2"
 msgid "Email options"
 msgstr "电子邮件选项"
 
 #. kCBDz
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:310
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:356
 msgctxt "mmresultemaildialog|sendallrb"
 msgid "S_end all documents"
 msgstr "发送所有文档 (_E)"
 
 #. EN8Jh
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:332
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:378
 msgctxt "mmresultemaildialog|fromrb"
 msgid "_From"
 msgstr "发件人 (_F)"
 
 #. S2Qdz
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:353
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:399
 msgctxt "mmresultemaildialog|toft"
 msgid "_To"
 msgstr "收件人 (_T)"
 
 #. kTAEG
-#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:406
+#: sw/uiconfig/swriter/ui/mmresultemaildialog.ui:452
 msgctxt "mmresultemaildialog|label1"
 msgid "Send records"
 msgstr "发送记录"
@@ -14948,181 +15044,181 @@ msgid "~File"
 msgstr "文件(~F)"
 
 #. 4gzad
-#: sw/uiconfig/swriter/ui/notebookbar.ui:4769
+#: sw/uiconfig/swriter/ui/notebookbar.ui:4567
 msgctxt "WriterNotebookbar|HomeMenuButton"
 msgid "_Home"
 msgstr "主页(_H)"
 
 #. JAhp6
-#: sw/uiconfig/swriter/ui/notebookbar.ui:4857
+#: sw/uiconfig/swriter/ui/notebookbar.ui:4655
 msgctxt "WriterNotebookbar|HomeLabel"
 msgid "~Home"
 msgstr "主页(~H)"
 
 #. NA9SG
-#: sw/uiconfig/swriter/ui/notebookbar.ui:6015
+#: sw/uiconfig/swriter/ui/notebookbar.ui:5813
 msgctxt "WriterNotebookbar|InsertMenuButton"
 msgid "_Insert"
 msgstr "插入(_I)"
 
 #. b4aNG
-#: sw/uiconfig/swriter/ui/notebookbar.ui:6123
+#: sw/uiconfig/swriter/ui/notebookbar.ui:5921
 msgctxt "WriterNotebookbar|InsertLabel"
 msgid "~Insert"
 msgstr "插入(~I)"
 
 #. 4t2ES
-#: sw/uiconfig/swriter/ui/notebookbar.ui:7217
+#: sw/uiconfig/swriter/ui/notebookbar.ui:7015
 msgctxt "WriterNotebookbar|LayoutMenuButton"
 msgid "_Layout"
 msgstr "布局(_L)"
 
 #. 4sDuv
-#: sw/uiconfig/swriter/ui/notebookbar.ui:7303
+#: sw/uiconfig/swriter/ui/notebookbar.ui:7101
 msgctxt "WriterNotebookbar|LayoutLabel"
 msgid "~Layout"
 msgstr "布局(~L)"
 
 #. iLbkU
-#: sw/uiconfig/swriter/ui/notebookbar.ui:8034
+#: sw/uiconfig/swriter/ui/notebookbar.ui:7832
 msgctxt "WriterNotebookbar|ReferencesMenuButton"
 msgid "Reference_s"
 msgstr "引用(_S)"
 
 #. GEwcS
-#: sw/uiconfig/swriter/ui/notebookbar.ui:8119
+#: sw/uiconfig/swriter/ui/notebookbar.ui:7917
 msgctxt "WriterNotebookbar|ReferencesLabel"
 msgid "Reference~s"
 msgstr "引用(~S)"
 
 #. fDqyq
-#: sw/uiconfig/swriter/ui/notebookbar.ui:9056
+#: sw/uiconfig/swriter/ui/notebookbar.ui:8854
 msgctxt "WriterNotebookbar|ReviewMenuButton"
 msgid "_Review"
 msgstr "审阅(_R)"
 
 #. rsvWQ
-#: sw/uiconfig/swriter/ui/notebookbar.ui:9142
+#: sw/uiconfig/swriter/ui/notebookbar.ui:8940
 msgctxt "WriterNotebookbar|ReviewLabel"
 msgid "~Review"
 msgstr "审阅(~R)"
 
 #. Lzxon
-#: sw/uiconfig/swriter/ui/notebookbar.ui:10012
+#: sw/uiconfig/swriter/ui/notebookbar.ui:9810
 msgctxt "WriterNotebookbar|ViewMenuButton"
 msgid "_View"
 msgstr "查看(_V)"
 
 #. WyVST
-#: sw/uiconfig/swriter/ui/notebookbar.ui:10098
+#: sw/uiconfig/swriter/ui/notebookbar.ui:9896
 msgctxt "WriterNotebookbar|ViewLabel"
 msgid "~View"
 msgstr "视图(~V)"
 
 #. RgE7C
-#: sw/uiconfig/swriter/ui/notebookbar.ui:11278
+#: sw/uiconfig/swriter/ui/notebookbar.ui:11076
 msgctxt "WriterNotebookbar|TableMenuButton"
 msgid "_Table"
 msgstr "表格(_T)"
 
 #. nFByf
-#: sw/uiconfig/swriter/ui/notebookbar.ui:11363
+#: sw/uiconfig/swriter/ui/notebookbar.ui:11161
 msgctxt "WriterNotebookbar|TableLabel"
 msgid "~Table"
 msgstr "表格(~T)"
 
 #. ePiUn
-#: sw/uiconfig/swriter/ui/notebookbar.ui:12541
+#: sw/uiconfig/swriter/ui/notebookbar.ui:12339
 msgctxt "WriterNotebookbar|ImageMenuButton"
 msgid "Ima_ge"
 msgstr "图像(_G)"
 
 #. tfZvk
-#: sw/uiconfig/swriter/ui/notebookbar.ui:12641
+#: sw/uiconfig/swriter/ui/notebookbar.ui:12439
 msgctxt "WriterNotebookbar|ImageLabel"
 msgid "Ima~ge"
 msgstr "图像(~G)"
 
 #. CAFm3
-#: sw/uiconfig/swriter/ui/notebookbar.ui:14004
+#: sw/uiconfig/swriter/ui/notebookbar.ui:13802
 msgctxt "WriterNotebookbar|DrawMenuButton"
 msgid "_Draw"
 msgstr "绘制(_D)"
 
 #. eBYpc
-#: sw/uiconfig/swriter/ui/notebookbar.ui:14114
+#: sw/uiconfig/swriter/ui/notebookbar.ui:13912
 msgctxt "WriterNotebookbar|DrawLabel"
 msgid "~Draw"
 msgstr "绘制(~D)"
 
 #. UPA2b
-#: sw/uiconfig/swriter/ui/notebookbar.ui:15008
+#: sw/uiconfig/swriter/ui/notebookbar.ui:14806
 msgctxt "WriterNotebookbar|ObjectMenuButton"
 msgid "_Object"
 msgstr "对象(_O)"
 
 #. gMACj
-#: sw/uiconfig/swriter/ui/notebookbar.ui:15094
+#: sw/uiconfig/swriter/ui/notebookbar.ui:14892
 msgctxt "WriterNotebookbar|ObjectLabel"
 msgid "~Object"
 msgstr "对象(~O)"
 
 #. YLmxD
-#: sw/uiconfig/swriter/ui/notebookbar.ui:15899
+#: sw/uiconfig/swriter/ui/notebookbar.ui:15697
 msgctxt "WriterNotebookbar|MediaMenuButton"
 msgid "_Media"
 msgstr "媒体(_M)"
 
 #. A9AmF
-#: sw/uiconfig/swriter/ui/notebookbar.ui:16006
+#: sw/uiconfig/swriter/ui/notebookbar.ui:15804
 msgctxt "WriterNotebookbar|MediaLabel"
 msgid "~Media"
 msgstr "媒体(~M)"
 
 #. SDFU4
-#: sw/uiconfig/swriter/ui/notebookbar.ui:16459
+#: sw/uiconfig/swriter/ui/notebookbar.ui:16257
 msgctxt "WriterNotebookbar|PrintMenuButton"
 msgid "_Print"
 msgstr "打印(_P)"
 
 #. uMQuW
-#: sw/uiconfig/swriter/ui/notebookbar.ui:16542
+#: sw/uiconfig/swriter/ui/notebookbar.ui:16340
 msgctxt "WriterNotebookbar|PrintLabel"
 msgid "~Print"
 msgstr "打印(~P)"
 
 #. 3sRtM
-#: sw/uiconfig/swriter/ui/notebookbar.ui:17377
+#: sw/uiconfig/swriter/ui/notebookbar.ui:17175
 msgctxt "WriterNotebookbar|FormMenuButton"
 msgid "Fo_rm"
 msgstr "表单(_R)"
 
 #. HbNSG
-#: sw/uiconfig/swriter/ui/notebookbar.ui:17462
+#: sw/uiconfig/swriter/ui/notebookbar.ui:17260
 msgctxt "WriterNotebookbar|FormLabel"
 msgid "Fo~rm"
 msgstr "表单(~R)"
 
 #. mrTYB
-#: sw/uiconfig/swriter/ui/notebookbar.ui:17519
+#: sw/uiconfig/swriter/ui/notebookbar.ui:17317
 msgctxt "WriterNotebookbar|FormMenuButton"
 msgid "E_xtension"
 msgstr "扩展(_X)"
 
 #. Gtj2Y
-#: sw/uiconfig/swriter/ui/notebookbar.ui:17593
+#: sw/uiconfig/swriter/ui/notebookbar.ui:17391
 msgctxt "WriterNotebookbar|ExtensionLabel"
 msgid "E~xtension"
 msgstr "扩展(~X)"
 
 #. FzYUk
-#: sw/uiconfig/swriter/ui/notebookbar.ui:18573
+#: sw/uiconfig/swriter/ui/notebookbar.ui:18371
 msgctxt "WriterNotebookbar|ToolsMenuButton"
 msgid "_Tools"
 msgstr "工具(_T)"
 
 #. 68iAK
-#: sw/uiconfig/swriter/ui/notebookbar.ui:18658
+#: sw/uiconfig/swriter/ui/notebookbar.ui:18456
 msgctxt "WriterNotebookbar|ToolsLabel"
 msgid "~Tools"
 msgstr "工具(~T)"
@@ -18411,31 +18507,31 @@ msgid "Other"
 msgstr "其他"
 
 #. APhFB
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:30
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:29
 msgctxt "privateuserpage|nameft"
 msgid "First/last _name/initials:"
 msgstr "名字/姓氏/缩写(_N):"
 
 #. wBySi
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:44
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:43
 msgctxt "privateuserpage|streetft"
 msgid "_Street:"
 msgstr "街道(_S):"
 
 #. DzXD5
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:58
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:57
 msgctxt "privateuserpage|countryft"
 msgid "Co_untry/state:"
 msgstr "国家/州(_U):"
 
 #. 3R8uD
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:72
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:71
 msgctxt "privateuserpage|titleft"
 msgid "_Title/profession:"
 msgstr "头衔/职业(_T):"
 
 #. 7ehFm
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:86
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:85
 msgctxt "privateuserpage|phoneft"
 msgid "Fa_x:"
 msgstr "传真(_X):"
@@ -18447,7 +18543,7 @@ msgid "Home telephone number"
 msgstr "家庭电话"
 
 #. mwVrz
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:105
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:104
 msgctxt "privateuserpage|faxft"
 msgid "Homepage/email:"
 msgstr "主页/电子邮件:"
@@ -18458,110 +18554,218 @@ msgctxt "privateuserpage|firstname-atkobject"
 msgid "First name"
 msgstr "名"
 
+#. XfEkD
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:128
+msgctxt "extended tip | firstname"
+msgid "Type your first name."
+msgstr ""
+
 #. PMz3U
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:144
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:145
 msgctxt "privateuserpage|lastname-atkobject"
 msgid "Last name"
 msgstr "姓"
 
+#. cWaCs
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:146
+msgctxt "extended tip | lastname"
+msgid "Type your last name."
+msgstr ""
+
 #. V5DfK
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:161
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:163
 msgctxt "privateuserpage|shortname-atkobject"
 msgid "Initials"
 msgstr "缩写"
 
+#. CYFY2
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:164
+msgctxt "extended tip | shortname"
+msgid "Type your initials."
+msgstr ""
+
 #. V9RgF
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:190
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:193
 msgctxt "privateuserpage|title-atkobject"
 msgid "Title"
 msgstr "头衔"
 
+#. 5G2ww
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:194
+msgctxt "extended tip | title"
+msgid "Type your title in this field."
+msgstr ""
+
 #. FcfuU
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:207
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:211
 msgctxt "privateuserpage|job-atkobject"
 msgid "Position"
 msgstr "职位"
 
+#. 9wRE5
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:212
+msgctxt "extended tips | job"
+msgid "Type your profession"
+msgstr ""
+
 #. 344nc
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:235
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:240
 msgctxt "privateuserpage|fax-atkobject"
 msgid "Home telephone number"
 msgstr "家庭电话"
 
+#. CtsEr
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:241
+msgctxt "extended tip | fax"
+msgid "Type your fax number in this field."
+msgstr ""
+
 #. GAZDK
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:265
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:271
 msgctxt "privateuserpage|url-atkobject"
 msgid "Fax number"
 msgstr "传真号码"
 
+#. D3t8m
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:272
+msgctxt "extended tips | url"
+msgid "Enter your home page"
+msgstr ""
+
 #. AnyFT
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:282
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:289
 msgctxt "privateuserpage|email-atkobject"
 msgid "email address"
 msgstr "email地址"
 
+#. 9sEPK
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:290
+msgctxt "extended tip | email"
+msgid "Type your e-mail address."
+msgstr ""
+
 #. Qxb4Q
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:302
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:309
 msgctxt "privateuserpage|eastnameft"
 msgid "First/last _name/initials 2:"
 msgstr "名字/姓氏/缩写 2 (_N):"
 
 #. VgiGB
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:324
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:332
 msgctxt "privateuserpage|firstname2-atkobject"
 msgid "Last name"
 msgstr "姓"
 
+#. V3dvt
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:333
+msgctxt "extended tips | firstname2"
+msgid "Type your first name"
+msgstr ""
+
 #. rDNHk
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:341
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:350
 msgctxt "privateuserpage|lastname2-atkobject"
 msgid "First name"
 msgstr "名"
 
+#. xCEPE
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:351
+msgctxt "extended tips | lastname2"
+msgid "Type your last name "
+msgstr ""
+
 #. rztbH
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:358
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:368
 msgctxt "privateuserpage|shortname2-atkobject"
 msgid "Initials"
 msgstr "首字母"
 
+#. DNHUN
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:369
+msgctxt "extended tips | shortname2"
+msgid "Type your initials"
+msgstr ""
+
 #. LGHpW
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:378
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:388
 msgctxt "privateuserpage|icityft"
 msgid "_Zip/city:"
 msgstr "邮编/城市(_Z):"
 
 #. AvWPi
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:400
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:411
 msgctxt "privateuserpage|icity-atkobject"
 msgid "City"
 msgstr "城市"
 
+#. knxAE
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:412
+msgctxt "extended tip | icity"
+msgid "Type the city where you live."
+msgstr ""
+
 #. AZwKD
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:417
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:429
 msgctxt "privateuserpage|izip-atkobject"
 msgid "Zip code"
 msgstr "邮政编码"
 
+#. 4zTys
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:430
+msgctxt "extended tip | izip"
+msgid "Type your ZIP in this field."
+msgstr ""
+
+#. VbiGF
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:458
+msgctxt "extended tip | street"
+msgid "Type the name of your street in this field."
+msgstr ""
+
+#. QmBKX
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:487
+msgctxt "extended tips | country"
+msgid "Type the country name"
+msgstr ""
+
+#. y652V
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:504
+msgctxt "extended tip | state"
+msgid "Type your state."
+msgstr ""
+
 #. zGzFe
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:496
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:523
 msgctxt "privateuserpage|titleft1"
 msgid "Phone/mobile:"
 msgstr "电话/手机:"
 
 #. Mszj6
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:519
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:547
 msgctxt "privateuserpage|phone-atkobject"
 msgid "Title"
 msgstr "头衔"
 
+#. XXAz3
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:548
+msgctxt "extended tips | phone"
+msgid "Type your phone number"
+msgstr ""
+
 #. GThP4
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:536
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:565
 msgctxt "privateuserpage|mobile-atkobject"
 msgid "Position"
 msgstr "职位"
 
+#. CEAMw
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:566
+msgctxt "extended tips | mobile"
+msgid "Type your mobile phone number"
+msgstr ""
+
 #. bGoA3
-#: sw/uiconfig/swriter/ui/privateuserpage.ui:559
+#: sw/uiconfig/swriter/ui/privateuserpage.ui:589
 msgctxt "privateuserpage|label1"
 msgid "Private Data"
 msgstr "私人资料"
@@ -19302,41 +19506,41 @@ msgctxt "sidebarwrap|label2"
 msgid "Wrap:"
 msgstr "环绕:"
 
-#. KrFLE
+#. CeCh8
 #: sw/uiconfig/swriter/ui/sidebarwrap.ui:73
 msgctxt "sidebarwrap|wrapoff|tooltip_text"
-msgid "Wrap Off"
-msgstr "环绕关闭"
+msgid "None"
+msgstr ""
 
-#. bCeup
+#. BM99o
 #: sw/uiconfig/swriter/ui/sidebarwrap.ui:86
 msgctxt "sidebarwrap|wrapon|tooltip_text"
-msgid "Wrap On"
-msgstr "环绕开启"
+msgid "Parallel"
+msgstr ""
 
-#. wGP6B
+#. 6LvB4
 #: sw/uiconfig/swriter/ui/sidebarwrap.ui:99
 msgctxt "sidebarwrap|wrapideal|tooltip_text"
-msgid "Wrap Ideal"
-msgstr "理想环绕"
+msgid "Optimal"
+msgstr ""
 
-#. JtHu6
+#. 2TrbF
 #: sw/uiconfig/swriter/ui/sidebarwrap.ui:112
-msgctxt "sidebarwrap|wrapleft|tooltip_text"
-msgid "Wrap Left"
-msgstr "左向环绕"
+msgctxt "sidebarwrap|wrapbefore|tooltip_text"
+msgid "Before"
+msgstr ""
 
-#. rQbTA
+#. oKykv
 #: sw/uiconfig/swriter/ui/sidebarwrap.ui:125
-msgctxt "sidebarwrap|wrapright|tooltip_text"
-msgid "Wrap Right"
-msgstr "右向环绕"
+msgctxt "sidebarwrap|wrapafter|tooltip_text"
+msgid "After"
+msgstr ""
 
-#. G23BK
+#. Sw6vj
 #: sw/uiconfig/swriter/ui/sidebarwrap.ui:138
 msgctxt "sidebarwrap|wrapthrough|tooltip_text"
-msgid "Wrap Through"
-msgstr "贯穿环绕"
+msgid "Through"
+msgstr ""
 
 #. PqGRt
 #: sw/uiconfig/swriter/ui/sortdialog.ui:29
@@ -21504,23 +21708,23 @@ msgctxt "wrapdialog|WrapDialog"
 msgid "Wrap"
 msgstr "环绕"
 
-#. nANFH
+#. kvc2L
 #: sw/uiconfig/swriter/ui/wrappage.ui:57
 msgctxt "wrappage|none"
-msgid "_None"
-msgstr "无(_N)"
+msgid "_Wrap Off"
+msgstr ""
 
-#. nCu5X
+#. VCQDF
 #: sw/uiconfig/swriter/ui/wrappage.ui:79
 msgctxt "wrappage|before"
-msgid "Before"
-msgstr "之前"
+msgid "Be_fore"
+msgstr ""
 
-#. KhEhR
+#. g5Tik
 #: sw/uiconfig/swriter/ui/wrappage.ui:101
 msgctxt "wrappage|after"
-msgid "After"
-msgstr "之后"
+msgid "Aft_er"
+msgstr ""
 
 #. NZJkB
 #: sw/uiconfig/swriter/ui/wrappage.ui:123