aboutsummaryrefslogtreecommitdiff
path: root/source/zh-CN/helpcontent2/source/text
diff options
context:
space:
mode:
Diffstat (limited to 'source/zh-CN/helpcontent2/source/text')
-rw-r--r--source/zh-CN/helpcontent2/source/text/sbasic/guide.po10
-rw-r--r--source/zh-CN/helpcontent2/source/text/sbasic/shared.po646
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/01.po4
-rw-r--r--source/zh-CN/helpcontent2/source/text/schart/00.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/schart/01.po4
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/01.po128
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/04.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/guide.po26
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/optionen.po10
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/guide.po4
10 files changed, 322 insertions, 522 deletions
diff --git a/source/zh-CN/helpcontent2/source/text/sbasic/guide.po b/source/zh-CN/helpcontent2/source/text/sbasic/guide.po
index 56789fbb33c..cc5f4da905e 100644
--- a/source/zh-CN/helpcontent2/source/text/sbasic/guide.po
+++ b/source/zh-CN/helpcontent2/source/text/sbasic/guide.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: 2017-05-09 16:45+0200\n"
+"POT-Creation-Date: 2017-05-17 15:41+0200\n"
"PO-Revision-Date: 2017-05-08 23:24+0000\n"
"Last-Translator: Reri <riwu@hotmail.co.uk>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -475,14 +475,6 @@ msgstr "REM 执行对话框"
#: sample_code.xhp
msgctxt ""
"sample_code.xhp\n"
-"par_id3146115\n"
-"help.text"
-msgid "End Sub"
-msgstr "End Sub"
-
-#: sample_code.xhp
-msgctxt ""
-"sample_code.xhp\n"
"hd_id3145387\n"
"help.text"
msgid "Add an Entry to a ListBox"
diff --git a/source/zh-CN/helpcontent2/source/text/sbasic/shared.po b/source/zh-CN/helpcontent2/source/text/sbasic/shared.po
index 11b9b87b94c..d3cd57fc7ef 100644
--- a/source/zh-CN/helpcontent2/source/text/sbasic/shared.po
+++ b/source/zh-CN/helpcontent2/source/text/sbasic/shared.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: 2017-05-09 16:45+0200\n"
+"POT-Creation-Date: 2017-05-17 15:41+0200\n"
"PO-Revision-Date: 2017-03-16 00:31+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6555,106 +6555,130 @@ msgstr "<emph>Type</emph>:任意整数表达式,用于指定对话框类型
#: 03010101.xhp
msgctxt ""
"03010101.xhp\n"
-"par_id3161832\n"
+"par_id051220170241588881\n"
"help.text"
-msgid "0 : Display OK button only."
-msgstr "0:仅显示“确定”按钮。"
+msgid "Named constant"
+msgstr ""
#: 03010101.xhp
msgctxt ""
"03010101.xhp\n"
-"par_id3153726\n"
+"par_id051220170241585541\n"
"help.text"
-msgid "1 : Display OK and Cancel buttons."
-msgstr "1:显示“确定”和“取消”按钮。"
+msgid "Integer value"
+msgstr ""
#: 03010101.xhp
msgctxt ""
"03010101.xhp\n"
-"par_id3149665\n"
+"par_id051220170241585124\n"
"help.text"
-msgid "2 : Display Abort, Retry, and Ignore buttons."
-msgstr "2:显示“中止”、“重试”和“忽略”按钮。"
+msgid "Definition"
+msgstr ""
#: 03010101.xhp
msgctxt ""
"03010101.xhp\n"
-"par_id3147318\n"
+"par_id3147397\n"
"help.text"
-msgid "3 : Display Yes, No and Cancel buttons."
-msgstr "3:显示“是”、“否”和“取消”按钮。"
+msgid "Display OK button only."
+msgstr ""
#: 03010101.xhp
msgctxt ""
"03010101.xhp\n"
-"par_id3155412\n"
+"par_id3145646\n"
"help.text"
-msgid "4 : Display Yes and No buttons."
-msgstr "4:显示“是”和“否”按钮。"
+msgid "Display OK and Cancel buttons."
+msgstr ""
#: 03010101.xhp
msgctxt ""
"03010101.xhp\n"
-"par_id3146119\n"
+"par_id3149410\n"
"help.text"
-msgid "5 : Display Retry and Cancel buttons."
-msgstr "5:显示“重试”和“取消”按钮。"
+msgid "Display Abort, Retry, and Ignore buttons."
+msgstr ""
#: 03010101.xhp
msgctxt ""
"03010101.xhp\n"
-"par_id3159155\n"
+"par_id3151075\n"
"help.text"
-msgid "16 : Add the Stop icon to the dialog."
-msgstr "16:在对话框中添加“停止”图标。"
+msgid "Display Yes, No, and Cancel buttons."
+msgstr ""
#: 03010101.xhp
msgctxt ""
"03010101.xhp\n"
-"par_id3145366\n"
+"par_id3153878\n"
"help.text"
-msgid "32 : Add the Question icon to the dialog."
-msgstr "32:在对话框中添加“问号”图标。"
+msgid "Display Yes and No buttons."
+msgstr ""
#: 03010101.xhp
msgctxt ""
"03010101.xhp\n"
-"par_id3147350\n"
+"par_id3155601\n"
"help.text"
-msgid "48 : Add the Exclamation icon to the dialog."
-msgstr "48:向对话框添加”感叹号“图标。"
+msgid "Display Retry and Cancel buttons."
+msgstr ""
#: 03010101.xhp
msgctxt ""
"03010101.xhp\n"
-"par_id3149960\n"
+"par_id3150716\n"
"help.text"
-msgid "64 : Add the Information icon to the dialog."
-msgstr "64:在对话框中添加“信息”图标。"
+msgid "Add the Stop icon to the dialog."
+msgstr ""
#: 03010101.xhp
msgctxt ""
"03010101.xhp\n"
-"par_id3154944\n"
+"par_id3153837\n"
"help.text"
-msgid "128 : First button in the dialog as default button."
-msgstr "128 : 将对话框中的第一个按钮作为默认按钮。"
+msgid "Add the Question icon to the dialog."
+msgstr ""
#: 03010101.xhp
msgctxt ""
"03010101.xhp\n"
-"par_id3155417\n"
+"par_id3150751\n"
"help.text"
-msgid "256 : Second button in the dialog as default button."
-msgstr "256:将对话框中的第二个按钮作为默认按钮。"
+msgid "Add the Exclamation Point icon to the dialog."
+msgstr ""
#: 03010101.xhp
msgctxt ""
"03010101.xhp\n"
-"par_id3153878\n"
+"par_id3146915\n"
+"help.text"
+msgid "Add the Information icon to the dialog."
+msgstr ""
+
+#: 03010101.xhp
+msgctxt ""
+"03010101.xhp\n"
+"par_id3145640\n"
+"help.text"
+msgid "First button in the dialog as default button."
+msgstr ""
+
+#: 03010101.xhp
+msgctxt ""
+"03010101.xhp\n"
+"par_id3153765\n"
+"help.text"
+msgid "Second button in the dialog as default button."
+msgstr ""
+
+#: 03010101.xhp
+msgctxt ""
+"03010101.xhp\n"
+"par_id3153715\n"
"help.text"
-msgid "512 : Third button in the dialog as default button."
-msgstr "512:将对话框中的第三个按钮作为默认按钮。"
+msgid "Third button in the dialog as default button."
+msgstr ""
#: 03010101.xhp
msgctxt ""
@@ -6795,106 +6819,130 @@ msgstr "<emph>数值</emph>"
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
+"par_id051220170241588881\n"
+"help.text"
+msgid "Named constant"
+msgstr ""
+
+#: 03010102.xhp
+msgctxt ""
+"03010102.xhp\n"
+"par_id051220170241585541\n"
+"help.text"
+msgid "Integer value"
+msgstr ""
+
+#: 03010102.xhp
+msgctxt ""
+"03010102.xhp\n"
+"par_id051220170241585124\n"
+"help.text"
+msgid "Definition"
+msgstr ""
+
+#: 03010102.xhp
+msgctxt ""
+"03010102.xhp\n"
"par_id3147397\n"
"help.text"
-msgid "0 : Display OK button only."
-msgstr "0:仅显示“确定”按钮。"
+msgid "Display OK button only."
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3145646\n"
"help.text"
-msgid "1 : Display OK and Cancel buttons."
-msgstr "1:显示“确定”和“取消”按钮。"
+msgid "Display OK and Cancel buttons."
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3149410\n"
"help.text"
-msgid "2 : Display Abort, Retry, and Ignore buttons."
-msgstr "2:显示“中止”、“重试”和“忽略”按钮。"
+msgid "Display Abort, Retry, and Ignore buttons."
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3151075\n"
"help.text"
-msgid "3 : Display Yes, No, and Cancel buttons."
-msgstr "3:显示“是”、“否”和“取消”按钮。"
+msgid "Display Yes, No, and Cancel buttons."
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3153878\n"
"help.text"
-msgid "4 : Display Yes and No buttons."
-msgstr "4:显示“是”和“否”按钮。"
+msgid "Display Yes and No buttons."
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3155601\n"
"help.text"
-msgid "5 : Display Retry and Cancel buttons."
-msgstr "5:显示“重试”和“取消”按钮。"
+msgid "Display Retry and Cancel buttons."
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3150716\n"
"help.text"
-msgid "16 : Add the Stop icon to the dialog."
-msgstr "16:在对话框中添加“停止”图标。"
+msgid "Add the Stop icon to the dialog."
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3153837\n"
"help.text"
-msgid "32 : Add the Question icon to the dialog."
-msgstr "32:在对话框中添加“问号”图标。"
+msgid "Add the Question icon to the dialog."
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3150751\n"
"help.text"
-msgid "48 : Add the Exclamation Point icon to the dialog."
-msgstr "48 : 在对话框中添加“感叹号”图标。"
+msgid "Add the Exclamation Point icon to the dialog."
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3146915\n"
"help.text"
-msgid "64 : Add the Information icon to the dialog."
-msgstr "64:在对话框中添加“信息”图标。"
+msgid "Add the Information icon to the dialog."
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3145640\n"
"help.text"
-msgid "128 : First button in the dialog as default button."
-msgstr "128 : 将对话框中的第一个按钮作为默认按钮。"
+msgid "First button in the dialog as default button."
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3153765\n"
"help.text"
-msgid "256 : Second button in the dialog as default button."
-msgstr "256:将对话框中的第二个按钮作为默认按钮。"
+msgid "Second button in the dialog as default button."
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3153715\n"
"help.text"
-msgid "512 : Third button in the dialog as default button."
-msgstr "512:将对话框中的第三个按钮作为默认按钮。"
+msgid "Third button in the dialog as default button."
+msgstr ""
#: 03010102.xhp
msgctxt ""
@@ -6907,58 +6955,82 @@ msgstr "<emph>返回值:</emph>"
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
+"par_id051220170330379805\n"
+"help.text"
+msgid "Named constant"
+msgstr ""
+
+#: 03010102.xhp
+msgctxt ""
+"03010102.xhp\n"
+"par_id051220170330387072\n"
+"help.text"
+msgid "Integer value"
+msgstr ""
+
+#: 03010102.xhp
+msgctxt ""
+"03010102.xhp\n"
+"par_id051220170330387973\n"
+"help.text"
+msgid "Definition"
+msgstr ""
+
+#: 03010102.xhp
+msgctxt ""
+"03010102.xhp\n"
"par_id3145230\n"
"help.text"
-msgid "1 : OK"
-msgstr "1:确定"
+msgid "OK"
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3149567\n"
"help.text"
-msgid "2 : Cancel"
-msgstr "2:取消"
+msgid "Cancel"
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id4056825\n"
"help.text"
-msgid "3 : Abort"
-msgstr "3:中止"
+msgid "Abort"
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3155335\n"
"help.text"
-msgid "4 : Retry"
-msgstr "4:重试"
+msgid "Retry"
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3146918\n"
"help.text"
-msgid "5 : Ignore"
-msgstr "5:忽略"
+msgid "Ignore"
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3155961\n"
"help.text"
-msgid "6 : Yes"
-msgstr "6:是"
+msgid "Yes"
+msgstr ""
#: 03010102.xhp
msgctxt ""
"03010102.xhp\n"
"par_id3148488\n"
"help.text"
-msgid "7 : No"
-msgstr "7:否"
+msgid "No"
+msgstr ""
#: 03010102.xhp
msgctxt ""
@@ -6992,6 +7064,14 @@ msgctxt ""
msgid "sVar = MsgBox( \"Las Vegas\",256 + 16 + 2,\"Dialog title\")"
msgstr "sVar = MsgBox( \"Las Vegas\",256 + 16 + 2,\"Dialog title\")"
+#: 03010102.xhp
+msgctxt ""
+"03010102.xhp\n"
+"par_id051220170242005479\n"
+"help.text"
+msgid "sVar = MsgBox(\"Las Vegas\", MB_DEFBUTTON2 + MB_ICONSTOP + MB_ABORTRETRYCANCEL, \"Dialog title\")"
+msgstr ""
+
#: 03010103.xhp
msgctxt ""
"03010103.xhp\n"
@@ -10779,42 +10859,82 @@ msgstr "数值"
#: 03020409.xhp
msgctxt ""
"03020409.xhp\n"
+"par_id051220170522586822\n"
+"help.text"
+msgid "Named constant"
+msgstr ""
+
+#: 03020409.xhp
+msgctxt ""
+"03020409.xhp\n"
+"par_id051220170522583099\n"
+"help.text"
+msgid "Value"
+msgstr ""
+
+#: 03020409.xhp
+msgctxt ""
+"03020409.xhp\n"
+"par_id051220170522583818\n"
+"help.text"
+msgid "Definition"
+msgstr ""
+
+#: 03020409.xhp
+msgctxt ""
+"03020409.xhp\n"
"par_id3147349\n"
"help.text"
-msgid "0 : Normal files."
-msgstr "0: 普通文件。"
+msgid "Normal files."
+msgstr ""
#: 03020409.xhp
msgctxt ""
"03020409.xhp\n"
"par_id3147434\n"
"help.text"
-msgid "1 : Read-only files."
-msgstr "1:只读文件。"
+msgid "Read-only files."
+msgstr ""
+
+#: 03020409.xhp
+msgctxt ""
+"03020409.xhp\n"
+"par_id051220170546544550\n"
+"help.text"
+msgid "Hidden file"
+msgstr ""
+
+#: 03020409.xhp
+msgctxt ""
+"03020409.xhp\n"
+"par_id051220170546546496\n"
+"help.text"
+msgid "System file"
+msgstr ""
#: 03020409.xhp
msgctxt ""
"03020409.xhp\n"
"par_id3159154\n"
"help.text"
-msgid "8 : Returns the name of the volume"
-msgstr "8:返回卷名称"
+msgid "Returns the name of the volume"
+msgstr ""
#: 03020409.xhp
msgctxt ""
"03020409.xhp\n"
"par_id3145271\n"
"help.text"
-msgid "16 : Returns the name of the directory only."
-msgstr "16:仅返回目录名称。"
+msgid "Returns the name of the directory only."
+msgstr ""
#: 03020409.xhp
msgctxt ""
"03020409.xhp\n"
"par_id3153953\n"
"help.text"
-msgid "32 : File was changed since last backup (Archive bit)."
-msgstr "32:上一次备份后文件已被修改(存档位)。"
+msgid "File was changed since last backup (Archive bit)."
+msgstr ""
#: 03020409.xhp
msgctxt ""
@@ -11363,26 +11483,50 @@ msgstr "<emph>数值</emph>"
#: 03020414.xhp
msgctxt ""
"03020414.xhp\n"
-"par_id3152596\n"
+"par_id051220170522586822\n"
"help.text"
-msgid "0 : Normal files."
-msgstr "0: 普通文件。"
+msgid "Named constant"
+msgstr ""
#: 03020414.xhp
msgctxt ""
"03020414.xhp\n"
-"par_id3149262\n"
+"par_id051220170522583099\n"
"help.text"
-msgid "1 : Read-only files."
-msgstr "1:只读文件。"
+msgid "Value"
+msgstr ""
#: 03020414.xhp
msgctxt ""
"03020414.xhp\n"
-"par_id3152576\n"
+"par_id051220170522583818\n"
+"help.text"
+msgid "Definition"
+msgstr ""
+
+#: 03020414.xhp
+msgctxt ""
+"03020414.xhp\n"
+"par_id3147349\n"
+"help.text"
+msgid "Normal files."
+msgstr ""
+
+#: 03020414.xhp
+msgctxt ""
+"03020414.xhp\n"
+"par_id3147434\n"
"help.text"
-msgid "32 : File was changed since last backup (Archive bit)."
-msgstr "32:上一次备份后文件已被修改(存档位)。"
+msgid "Read-only files."
+msgstr ""
+
+#: 03020414.xhp
+msgctxt ""
+"03020414.xhp\n"
+"par_id051220170546544550\n"
+"help.text"
+msgid "Hidden file"
+msgstr ""
#: 03020414.xhp
msgctxt ""
@@ -14155,14 +14299,6 @@ msgstr "语法:"
#: 03030203.xhp
msgctxt ""
"03030203.xhp\n"
-"par_id3149655\n"
-"help.text"
-msgid "Now"
-msgstr "Now"
-
-#: 03030203.xhp
-msgctxt ""
-"03030203.xhp\n"
"hd_id3154366\n"
"help.text"
msgid "Return value:"
@@ -14787,14 +14923,6 @@ msgstr "语法:"
#: 03030302.xhp
msgctxt ""
"03030302.xhp\n"
-"par_id3149670\n"
-"help.text"
-msgid "Time"
-msgstr "Time"
-
-#: 03030302.xhp
-msgctxt ""
-"03030302.xhp\n"
"hd_id3150792\n"
"help.text"
msgid "Parameters:"
@@ -14875,14 +15003,6 @@ msgstr "语法:"
#: 03030303.xhp
msgctxt ""
"03030303.xhp\n"
-"par_id3161831\n"
-"help.text"
-msgid "Timer"
-msgstr "Timer"
-
-#: 03030303.xhp
-msgctxt ""
-"03030303.xhp\n"
"hd_id3146975\n"
"help.text"
msgid "Return value:"
@@ -14995,14 +15115,6 @@ msgstr "语法:"
#: 03050100.xhp
msgctxt ""
"03050100.xhp\n"
-"par_id3146795\n"
-"help.text"
-msgid "Erl"
-msgstr "Erl"
-
-#: 03050100.xhp
-msgctxt ""
-"03050100.xhp\n"
"hd_id3147265\n"
"help.text"
msgid "Return value:"
@@ -15107,14 +15219,6 @@ msgstr "语法:"
#: 03050200.xhp
msgctxt ""
"03050200.xhp\n"
-"par_id3154123\n"
-"help.text"
-msgid "Err"
-msgstr "Err"
-
-#: 03050200.xhp
-msgctxt ""
-"03050200.xhp\n"
"hd_id3147229\n"
"help.text"
msgid "Return value:"
@@ -17683,14 +17787,6 @@ msgstr "示例:"
#: 03080201.xhp
msgctxt ""
"03080201.xhp\n"
-"par_id3159254\n"
-"help.text"
-msgid "Const b2=1.345e34"
-msgstr "Const b2=1.345e34"
-
-#: 03080201.xhp
-msgctxt ""
-"03080201.xhp\n"
"par_id3161832\n"
"help.text"
msgid "MsgBox \"\" & dValue & chr(13) & (b1*b2) ,0,\"Multiplication by logarithm\""
@@ -20224,14 +20320,6 @@ msgctxt ""
msgid "MsgBox sText,0,\"Text encoded\""
msgstr "MsgBox sText,0,\"Text encoded\""
-#: 03090203.xhp
-msgctxt ""
-"03090203.xhp\n"
-"par_id3145251\n"
-"help.text"
-msgid "End Sub"
-msgstr "End Sub"
-
#: 03090300.xhp
msgctxt ""
"03090300.xhp\n"
@@ -21147,14 +21235,6 @@ msgstr "语法:"
#: 03090404.xhp
msgctxt ""
"03090404.xhp\n"
-"par_id3148552\n"
-"help.text"
-msgid "End, End Function, End If, End Select, End Sub"
-msgstr "End、End Function、End If、End Select、End Sub"
-
-#: 03090404.xhp
-msgctxt ""
-"03090404.xhp\n"
"hd_id3149456\n"
"help.text"
msgid "Parameters:"
@@ -21651,14 +21731,6 @@ msgstr "语法:"
#: 03090408.xhp
msgctxt ""
"03090408.xhp\n"
-"par_id3156023\n"
-"help.text"
-msgid "Stop"
-msgstr "Stop"
-
-#: 03090408.xhp
-msgctxt ""
-"03090408.xhp\n"
"hd_id3156344\n"
"help.text"
msgid "Example:"
@@ -25531,14 +25603,6 @@ msgstr "语法:"
#: 03102450.xhp
msgctxt ""
"03102450.xhp\n"
-"par_idN10565\n"
-"help.text"
-msgid "IsError (Var)"
-msgstr "IsError (Var)"
-
-#: 03102450.xhp
-msgctxt ""
-"03102450.xhp\n"
"par_idN10568\n"
"help.text"
msgid "Return value:"
@@ -26235,14 +26299,6 @@ msgstr "语法:"
#: 03103200.xhp
msgctxt ""
"03103200.xhp\n"
-"par_id3147573\n"
-"help.text"
-msgid "Option Base { 0 | 1}"
-msgstr "Option Base { 0 | 1}"
-
-#: 03103200.xhp
-msgctxt ""
-"03103200.xhp\n"
"hd_id3145315\n"
"help.text"
msgid "Parameters:"
@@ -26307,14 +26363,6 @@ msgstr "语法:"
#: 03103300.xhp
msgctxt ""
"03103300.xhp\n"
-"par_id3149514\n"
-"help.text"
-msgid "Option Explicit"
-msgstr "Option Explicit"
-
-#: 03103300.xhp
-msgctxt ""
-"03103300.xhp\n"
"hd_id3145315\n"
"help.text"
msgid "Parameters:"
@@ -26979,14 +27027,6 @@ msgstr "例如,以下命令:"
#: 03103800.xhp
msgctxt ""
"03103800.xhp\n"
-"par_id3148473\n"
-"help.text"
-msgid "MyObj.Prop1.Command = 5"
-msgstr "MyObj.Prop1.Command = 5"
-
-#: 03103800.xhp
-msgctxt ""
-"03103800.xhp\n"
"par_id3156023\n"
"help.text"
msgid "corresponds to the command block:"
@@ -26995,62 +27035,6 @@ msgstr "与以下命令块相对应:"
#: 03103800.xhp
msgctxt ""
"03103800.xhp\n"
-"par_id3153896\n"
-"help.text"
-msgid "Dim ObjVar as Object"
-msgstr "Dim ObjVar as Object"
-
-#: 03103800.xhp
-msgctxt ""
-"03103800.xhp\n"
-"par_id3154760\n"
-"help.text"
-msgid "Dim ObjProp as Object"
-msgstr "Dim ObjProp as Object"
-
-#: 03103800.xhp
-msgctxt ""
-"03103800.xhp\n"
-"par_id3145069\n"
-"help.text"
-msgid "ObjName As String = \"MyObj\""
-msgstr "ObjName As String = \"MyObj\""
-
-#: 03103800.xhp
-msgctxt ""
-"03103800.xhp\n"
-"par_id3154939\n"
-"help.text"
-msgid "ObjVar = FindObject( ObjName As String )"
-msgstr "ObjVar = FindObject( ObjName As String )"
-
-#: 03103800.xhp
-msgctxt ""
-"03103800.xhp\n"
-"par_id3150793\n"
-"help.text"
-msgid "PropName As String = \"Prop1\""
-msgstr "PropName As String = \"Prop1\""
-
-#: 03103800.xhp
-msgctxt ""
-"03103800.xhp\n"
-"par_id3154141\n"
-"help.text"
-msgid "ObjProp = FindPropertyObject( ObjVar, PropName As String )"
-msgstr "ObjProp = FindPropertyObject( ObjVar, PropName As String )"
-
-#: 03103800.xhp
-msgctxt ""
-"03103800.xhp\n"
-"par_id3156424\n"
-"help.text"
-msgid "ObjProp.Command = 5"
-msgstr "ObjProp.Command = 5"
-
-#: 03103800.xhp
-msgctxt ""
-"03103800.xhp\n"
"par_id3145420\n"
"help.text"
msgid "This allows names to be dynamically created at run-time. For example:"
@@ -27083,14 +27067,6 @@ msgstr "语法:"
#: 03103800.xhp
msgctxt ""
"03103800.xhp\n"
-"par_id3151042\n"
-"help.text"
-msgid "FindObject( ObjName As String )"
-msgstr "FindObject( ObjName As String )"
-
-#: 03103800.xhp
-msgctxt ""
-"03103800.xhp\n"
"hd_id3159254\n"
"help.text"
msgid "Parameters:"
@@ -27147,14 +27123,6 @@ msgstr "例如,命令:"
#: 03103900.xhp
msgctxt ""
"03103900.xhp\n"
-"par_id3145610\n"
-"help.text"
-msgid "MyObj.Prop1.Command = 5"
-msgstr "MyObj.Prop1.Command = 5"
-
-#: 03103900.xhp
-msgctxt ""
-"03103900.xhp\n"
"par_id3147265\n"
"help.text"
msgid "corresponds to the following command block:"
@@ -27163,62 +27131,6 @@ msgstr "与以下命令块相对应:"
#: 03103900.xhp
msgctxt ""
"03103900.xhp\n"
-"par_id3153896\n"
-"help.text"
-msgid "Dim ObjVar as Object"
-msgstr "Dim ObjVar as Object"
-
-#: 03103900.xhp
-msgctxt ""
-"03103900.xhp\n"
-"par_id3148664\n"
-"help.text"
-msgid "Dim ObjProp as Object"
-msgstr "Dim ObjProp as Object"
-
-#: 03103900.xhp
-msgctxt ""
-"03103900.xhp\n"
-"par_id3150792\n"
-"help.text"
-msgid "ObjName As String = \"MyObj\""
-msgstr "ObjName As String = \"MyObj\""
-
-#: 03103900.xhp
-msgctxt ""
-"03103900.xhp\n"
-"par_id3154365\n"
-"help.text"
-msgid "ObjVar = FindObject( ObjName As String )"
-msgstr "ObjVar = FindObject( ObjName As String )"
-
-#: 03103900.xhp
-msgctxt ""
-"03103900.xhp\n"
-"par_id3148453\n"
-"help.text"
-msgid "PropName As String = \"Prop1\""
-msgstr "PropName As String = \"Prop1\""
-
-#: 03103900.xhp
-msgctxt ""
-"03103900.xhp\n"
-"par_id3150449\n"
-"help.text"
-msgid "ObjProp = FindPropertyObject( ObjVar, PropName As String )"
-msgstr "ObjProp = FindPropertyObject( ObjVar, PropName As String )"
-
-#: 03103900.xhp
-msgctxt ""
-"03103900.xhp\n"
-"par_id3159152\n"
-"help.text"
-msgid "ObjProp.Command = 5"
-msgstr "ObjProp.Command = 5"
-
-#: 03103900.xhp
-msgctxt ""
-"03103900.xhp\n"
"par_id3156214\n"
"help.text"
msgid "To dynamically create Names at run-time, use:"
@@ -27251,14 +27163,6 @@ msgstr "语法:"
#: 03103900.xhp
msgctxt ""
"03103900.xhp\n"
-"par_id3149560\n"
-"help.text"
-msgid "FindPropertyObject( ObjVar, PropName As String )"
-msgstr "FindPropertyObject( ObjVar, PropName As String )"
-
-#: 03103900.xhp
-msgctxt ""
-"03103900.xhp\n"
"hd_id3150012\n"
"help.text"
msgid "Parameters:"
@@ -28915,14 +28819,6 @@ msgstr "语法:"
#: 03120201.xhp
msgctxt ""
"03120201.xhp\n"
-"par_id3143267\n"
-"help.text"
-msgid "Space (n As Long)"
-msgstr "Space (n As Integer)"
-
-#: 03120201.xhp
-msgctxt ""
-"03120201.xhp\n"
"hd_id3147242\n"
"help.text"
msgid "Return value:"
@@ -31515,14 +31411,6 @@ msgstr "语法:"
#: 03130100.xhp
msgctxt ""
"03130100.xhp\n"
-"par_id3147291\n"
-"help.text"
-msgid "Beep"
-msgstr "Beep"
-
-#: 03130100.xhp
-msgctxt ""
-"03130100.xhp\n"
"hd_id3148538\n"
"help.text"
msgid "Example:"
@@ -31835,14 +31723,6 @@ msgstr "语法:"
#: 03130700.xhp
msgctxt ""
"03130700.xhp\n"
-"par_id3147242\n"
-"help.text"
-msgid "GetSystemTicks()"
-msgstr "GetSystemTicks()"
-
-#: 03130700.xhp
-msgctxt ""
-"03130700.xhp\n"
"hd_id3149233\n"
"help.text"
msgid "Return value:"
@@ -32011,14 +31891,6 @@ msgstr "语法:"
#: 03131000.xhp
msgctxt ""
"03131000.xhp\n"
-"par_id3155388\n"
-"help.text"
-msgid "s = GetSolarVersion"
-msgstr "s = GetSolarVersion"
-
-#: 03131000.xhp
-msgctxt ""
-"03131000.xhp\n"
"hd_id3149514\n"
"help.text"
msgid "Return value:"
@@ -32091,14 +31963,6 @@ msgstr "语法:"
#: 03131300.xhp
msgctxt ""
"03131300.xhp\n"
-"par_id3151110\n"
-"help.text"
-msgid "n = TwipsPerPixelX"
-msgstr "n = TwipsPerPixelX"
-
-#: 03131300.xhp
-msgctxt ""
-"03131300.xhp\n"
"hd_id3150669\n"
"help.text"
msgid "Return value:"
@@ -32171,14 +32035,6 @@ msgstr "语法:"
#: 03131400.xhp
msgctxt ""
"03131400.xhp\n"
-"par_id3153681\n"
-"help.text"
-msgid "n = TwipsPerPixelY"
-msgstr "n = TwipsPerPixelY"
-
-#: 03131400.xhp
-msgctxt ""
-"03131400.xhp\n"
"hd_id3148473\n"
"help.text"
msgid "Return value:"
@@ -33107,14 +32963,6 @@ msgstr "语法:"
#: 03132100.xhp
msgctxt ""
"03132100.xhp\n"
-"par_id3147143\n"
-"help.text"
-msgid "GetGUIType()"
-msgstr "GetGUIType()"
-
-#: 03132100.xhp
-msgctxt ""
-"03132100.xhp\n"
"hd_id3149346\n"
"help.text"
msgid "Return value:"
@@ -33203,14 +33051,6 @@ msgstr "语法:"
#: 03132200.xhp
msgctxt ""
"03132200.xhp\n"
-"par_id3151056\n"
-"help.text"
-msgid "ThisComponent"
-msgstr "ThisComponent"
-
-#: 03132200.xhp
-msgctxt ""
-"03132200.xhp\n"
"hd_id3154940\n"
"help.text"
msgid "Example:"
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/01.po b/source/zh-CN/helpcontent2/source/text/scalc/01.po
index 537a0119078..517595e3a77 100644
--- a/source/zh-CN/helpcontent2/source/text/scalc/01.po
+++ b/source/zh-CN/helpcontent2/source/text/scalc/01.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libreoffice help\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2017-05-12 14:35+0200\n"
+"POT-Creation-Date: 2017-05-18 00:24+0200\n"
"PO-Revision-Date: 2017-03-16 15:46+0000\n"
"Last-Translator: Reri <riwu@hotmail.co.uk>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17525,7 +17525,7 @@ msgctxt ""
"04060107.xhp\n"
"par_id3178518\n"
"help.text"
-msgid "Then <emph>make sure to enter it as matrix formula with <switchinline select=\"sys\"><caseinline select=\"MAC\">Shift+Command+Enter</caseinline><defaultinline>Shift+Ctrl+Enter</defaultinline></switchinline></emph>. The result will be as follows:"
+msgid "Then <emph>make sure to enter it as matrix formula with </emph><switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Shift+Command+Enter</emph></caseinline><defaultinline><emph>Shift+Ctrl+Enter</emph></defaultinline></switchinline>. The result will be as follows:"
msgstr ""
#: 04060107.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/schart/00.po b/source/zh-CN/helpcontent2/source/text/schart/00.po
index 5727576277c..3cf9f50e8bd 100644
--- a/source/zh-CN/helpcontent2/source/text/schart/00.po
+++ b/source/zh-CN/helpcontent2/source/text/schart/00.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: 2017-05-09 16:45+0200\n"
+"POT-Creation-Date: 2017-05-17 15:41+0200\n"
"PO-Revision-Date: 2016-05-02 14:21+0000\n"
"Last-Translator: 琨珑 锁 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -173,8 +173,8 @@ msgctxt ""
"00000004.xhp\n"
"par_id1061738\n"
"help.text"
-msgid "<variable id=\"trendlines\">Choose Insert - Trend Lines (Charts)</variable>"
-msgstr "<variable id=\"trendlines\">选择“插入”-“趋势线”(图表)</variable>"
+msgid "<variable id=\"trendlines\">Choose <emph>Insert - Trend Line</emph> (Charts)</variable>"
+msgstr ""
#: 00000004.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/schart/01.po b/source/zh-CN/helpcontent2/source/text/schart/01.po
index 15c2f4e0880..291ac131424 100644
--- a/source/zh-CN/helpcontent2/source/text/schart/01.po
+++ b/source/zh-CN/helpcontent2/source/text/schart/01.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: 2017-05-09 16:45+0200\n"
+"POT-Creation-Date: 2017-05-17 15:41+0200\n"
"PO-Revision-Date: 2017-02-17 01:00+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1389,7 +1389,7 @@ msgctxt ""
"04050100.xhp\n"
"par_id4349192\n"
"help.text"
-msgid "To insert a trend line for a data series, select the data series in the chart. Choose <item type=\"menuitem\">Insert - Trend Lines</item>, or right-click to open the context menu, and choose <item type=\"menuitem\">Insert - Trend Line</item>."
+msgid "To insert a trend line for a data series, select the data series in the chart. Choose <item type=\"menuitem\">Insert - Trend Line</item>, or right-click to open the context menu, and choose <item type=\"menuitem\">Insert Trend Line</item>."
msgstr ""
#: 04050100.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/shared/01.po b/source/zh-CN/helpcontent2/source/text/shared/01.po
index f3f25a30b48..20771956911 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/01.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/01.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: 2017-05-12 14:35+0200\n"
+"POT-Creation-Date: 2017-05-17 15:41+0200\n"
"PO-Revision-Date: 2017-01-19 05:44+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3699,10 +3699,10 @@ msgstr "<ahelp hid=\".\">允许您管理和编辑模板,还可将当前文件
#: 01110000.xhp
msgctxt ""
"01110000.xhp\n"
-"hd_id3149893\n"
+"par_01110001\n"
"help.text"
-msgid "<link href=\"text/shared/01/01110101.xhp\" name=\"Address Book Source\">Address Book Source</link>"
-msgstr "<link href=\"text/shared/01/01110101.xhp\" name=\"通讯簿来源\">通讯簿来源</link>"
+msgid "Select <emph>File - Templates</emph>"
+msgstr ""
#: 01110101.xhp
msgctxt ""
@@ -3837,136 +3837,96 @@ msgctxt ""
"01110300.xhp\n"
"tit\n"
"help.text"
-msgid "Saving (Templates)"
-msgstr "保存(模板)"
+msgid "Save as Template"
+msgstr ""
#: 01110300.xhp
msgctxt ""
"01110300.xhp\n"
"hd_id3160463\n"
"help.text"
-msgid "<link href=\"text/shared/01/01110300.xhp\" name=\"Saving (Templates)\">Saving (Templates)</link>"
-msgstr "<link href=\"text/shared/01/01110300.xhp\" name=\"保存(模板)\">保存(模板)</link>"
+msgid "<link href=\"text/shared/01/01110300.xhp\" name=\"Save as Template\">Save as Template</link>"
+msgstr ""
#: 01110300.xhp
msgctxt ""
"01110300.xhp\n"
"par_id3157898\n"
"help.text"
-msgid "<ahelp hid=\".uno:SaveAsTemplate\">Saves the current document as a template.</ahelp>"
-msgstr "<ahelp hid=\".uno:SaveAsTemplate\">将当前文档另存为模板。</ahelp>"
-
-#: 01110300.xhp
-msgctxt ""
-"01110300.xhp\n"
-"hd_id3147226\n"
-"help.text"
-msgid "New Template"
-msgstr "新建模板"
+msgid "<ahelp hid=\".\">Saves the current document as a template.</ahelp>"
+msgstr ""
#: 01110300.xhp
msgctxt ""
"01110300.xhp\n"
-"par_id3147043\n"
+"par_id01110301\n"
"help.text"
-msgid "<ahelp hid=\"SFX2:EDIT:DLG_DOC_TEMPLATE:ED_NAME\">Enter a name for the template.</ahelp>"
-msgstr "<ahelp hid=\"SFX2:EDIT:DLG_DOC_TEMPLATE:ED_NAME\">输入模板名称。</ahelp>"
+msgid "Select <emph>File - Templates - Save as Template</emph>"
+msgstr ""
#: 01110300.xhp
msgctxt ""
"01110300.xhp\n"
-"hd_id3147571\n"
+"hd_id3147226\n"
"help.text"
-msgid "Templates"
-msgstr "模板"
+msgid "Template Name"
+msgstr ""
#: 01110300.xhp
msgctxt ""
"01110300.xhp\n"
-"par_id3150774\n"
+"par_id3147043\n"
"help.text"
-msgid "Lists templates and template categories."
-msgstr "列出模板和模板类别。"
+msgid "<ahelp hid=\".\">Enter a name for the template.</ahelp>"
+msgstr ""
#: 01110300.xhp
msgctxt ""
"01110300.xhp\n"
-"hd_id3143268\n"
+"hd_id3147571\n"
"help.text"
-msgid "Categories"
-msgstr "类别"
+msgid "Template Category"
+msgstr ""
#: 01110300.xhp
msgctxt ""
"01110300.xhp\n"
-"par_id3159233\n"
+"par_id3150774\n"
"help.text"
-msgid "<ahelp hid=\"SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_SECTION\">Select a category in which to save the new template.</ahelp>"
-msgstr "<ahelp hid=\"SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_SECTION\">选择要将该模板保存为的类别。</ahelp>"
+msgid "<ahelp hid=\".\">Select a category in which to save the new template.</ahelp>"
+msgstr ""
#: 01110300.xhp
msgctxt ""
"01110300.xhp\n"
-"hd_id3150693\n"
+"hd_id3143268\n"
"help.text"
-msgid "Templates"
-msgstr "模板"
+msgid "Set as default template"
+msgstr ""
#: 01110300.xhp
msgctxt ""
"01110300.xhp\n"
"par_id3149398\n"
"help.text"
-msgid "<ahelp hid=\"SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_STYLESHEETS\">Lists the available template categories.</ahelp>"
-msgstr "<ahelp hid=\"SFX2:LISTBOX:DLG_DOC_TEMPLATE:LB_STYLESHEETS\">列出可用的模板类别。</ahelp>"
-
-#: 01110300.xhp
-msgctxt ""
-"01110300.xhp\n"
-"hd_id3163803\n"
-"help.text"
-msgid "Edit"
-msgstr "编辑"
-
-#: 01110300.xhp
-msgctxt ""
-"01110300.xhp\n"
-"par_id3147242\n"
-"help.text"
-msgid "<ahelp hid=\"SFX2:PUSHBUTTON:DLG_DOC_TEMPLATE:BT_EDIT\">Opens the selected template for editing.</ahelp>"
-msgstr "<ahelp hid=\"SFX2:PUSHBUTTON:DLG_DOC_TEMPLATE:BT_EDIT\">打开选定模板以进行编辑。</ahelp>"
-
-#: 01110300.xhp
-msgctxt ""
-"01110300.xhp\n"
-"hd_id3156156\n"
-"help.text"
-msgid "Organize"
-msgstr "管理"
-
-#: 01110300.xhp
-msgctxt ""
-"01110300.xhp\n"
-"par_id3155419\n"
-"help.text"
-msgid "<ahelp hid=\"SFX2:PUSHBUTTON:DLG_DOC_TEMPLATE:BT_ORGANIZE\">Opens the <emph>Template Management</emph> dialog where you can organize or create new templates.</ahelp>"
-msgstr "<ahelp hid=\"SFX2:PUSHBUTTON:DLG_DOC_TEMPLATE:BT_ORGANIZE\">打开<emph>模板管理</emph>对话框,可在其中管理或创建新模板。</ahelp>"
+msgid "<ahelp hid=\".\">The new template will be used as the default template.</ahelp>"
+msgstr ""
#: 01110400.xhp
msgctxt ""
"01110400.xhp\n"
"tit\n"
"help.text"
-msgid "Edit"
-msgstr "编辑"
+msgid "Open Template"
+msgstr ""
#: 01110400.xhp
msgctxt ""
"01110400.xhp\n"
"hd_id3150620\n"
"help.text"
-msgid "<link href=\"text/shared/01/01110400.xhp\" name=\"Edit\">Edit</link>"
-msgstr "<link href=\"text/shared/01/01110400.xhp\" name=\"编辑\">编辑</link>"
+msgid "<link href=\"text/shared/01/01110400.xhp\" name=\"Open Template\">Open Template</link>"
+msgstr ""
#: 01110400.xhp
msgctxt ""
@@ -3976,6 +3936,14 @@ msgctxt ""
msgid "<ahelp hid=\".uno:OpenTemplate\">Opens a dialog where you can select a template for editing.</ahelp>"
msgstr "<ahelp hid=\".uno:OpenTemplate\" visibility=\"visible\">打开对话框,可以在其中选择要编辑的模板。</ahelp>"
+#: 01110400.xhp
+msgctxt ""
+"01110400.xhp\n"
+"par_id01110401\n"
+"help.text"
+msgid "Select <emph>File - Templates - Open Template</emph>"
+msgstr ""
+
#: 01130000.xhp
msgctxt ""
"01130000.xhp\n"
@@ -14333,7 +14301,7 @@ msgctxt ""
"05020301.xhp\n"
"par_id3153323\n"
"help.text"
-msgid "Use question marks (?) to represent the number of digits to include in the numerator and the denominator of a fraction. Fractions that do not fit the pattern that you define are displayed as floating point numbers."
+msgid "Use question marks (?), zeroes (0) or number signs (#) to represent the number of digits to include in the numerator and the denominator of a fraction. Fractions that do not fit the pattern that you define are displayed as floating point numbers."
msgstr ""
#: 05020301.xhp
@@ -14541,7 +14509,7 @@ msgctxt ""
"05020301.xhp\n"
"par_id3154380\n"
"help.text"
-msgid "Depending on your language setting, you can use a comma, a period or a blank as a thousands separator. You can also use the separator to reduce the size of the number that is displayed by a multiple of 1000 for each separator."
+msgid "Depending on your language setting, you can use a comma, a period or a blank as a thousands separator. You can also use the separator to reduce the size of the number that is displayed by a multiple of 1000 for each separator. The examples below use comma as thousands separator:"
msgstr ""
#: 05020301.xhp
@@ -14613,7 +14581,7 @@ msgctxt ""
"05020301.xhp\n"
"par_id3154224\n"
"help.text"
-msgid "To include text in a number format that is applied to a cell containing numbers, place a double quotation mark (\") in front of and behind the text, or a backslash (\\) before a single character. For example, enter <emph>#.# \"meters\"</emph> to display \"3.5 meters\" or <emph>#.# \\m</emph> to display \"3.5 m\"."
+msgid "To include text in a number format that is applied to a cell containing numbers, place a double quotation mark (\") in front of and behind the text, or a backslash (\\) before a single character. For example, enter <emph>#.# \"meters\"</emph> to display \"3.5 meters\" or <emph>#.# \\m</emph> to display \"3.5 m\". If you use space as thousands separator, you need to insert spaces between quotes in the previous examples: <emph>#.#\" meters\"</emph> or <emph>#.#\\ \\m</emph> to get the correct result."
msgstr ""
#: 05020301.xhp
@@ -14877,7 +14845,7 @@ msgctxt ""
"05020301.xhp\n"
"par_id3146923\n"
"help.text"
-msgid "Scientific notation lets you write very large numbers or very small fractions in a compact form. For example, in scientific notation, 650000 is written as 6.5 x 10^5, and 0.000065 as 6.5 x 10^-5. In <item type=\"productname\">%PRODUCTNAME</item>, these numbers are written as 6.5E+5 and 6.5E-5, respectively. To create a number format that displays numbers using scientific notation, enter a # or 0, and then one of the following codes E-, E+, e- or e+. If sign is omitted after E or e, it won't appear for positive value of exponent. To get engineering notation, enter 3 digits (0 or #) in the integer part. For instance: ###.##E+00"
+msgid "Scientific notation lets you write very large numbers or very small fractions in a compact form. For example, in scientific notation, 650000 is written as 6.5 x 10<sup>5</sup>, and 0.000065 as 6.5 x 10<sup>-5</sup>. In <item type=\"productname\">%PRODUCTNAME</item>, these numbers are written as 6.5E+5 and 6.5E-5, respectively. To create a number format that displays numbers using scientific notation, enter a # or 0, and then one of the following codes E-, E+, e- or e+. If sign is omitted after E or e, it won't appear for positive value of exponent. To get engineering notation, enter 3 digits (0 or #) in the integer part: <emph>###.##E+00</emph> for instance."
msgstr ""
#: 05020301.xhp
@@ -14949,7 +14917,7 @@ msgctxt ""
"05020301.xhp\n"
"par_id3150032\n"
"help.text"
-msgid "You can also specify the locale setting for the currency by entering the locale code for the country after the symbol. For example, [$€-407] represents Euros in Germany. To view the locale code for a country, select the country in the <emph>Language</emph> list on the <emph>Numbers</emph> tab of the <emph>Format Cells</emph> dialog."
+msgid "You can also specify the locale setting for the currency by entering the locale code for the country after the symbol. For example, <emph>[$€-407]</emph> represents Euros in Germany. To view the locale code for a country, select the country in the <emph>Language</emph> list on the <emph>Numbers</emph> tab of the <emph>Format Cells</emph> dialog."
msgstr ""
#: 05020301.xhp
@@ -17469,7 +17437,7 @@ msgctxt ""
"05020301.xhp\n"
"par_id23102016130928602\n"
"help.text"
-msgid "Extended LCID consists of 8 hexadecimal digits: <emph>[$-NNCCLLLL]</emph>, with 2 first digits NN for native numerals, CC for calendar and LLLL for LCID code. For instance, [$-0D0741E] will be converted to [NatNum1][$-41E][~buddhist]: Thai numerals (0D) with Buddhist calendar (07) in Thai locale (041E)."
+msgid "Extended LCID consists of 8 hexadecimal digits: <emph>[$-NNCCLLLL]</emph>, with 2 first digits NN for native numerals, CC for calendar and LLLL for LCID code. For instance, <emph>[$-0D0741E]</emph> will be converted to <emph>[NatNum1][$-41E][~buddhist]</emph>: Thai numerals (0D) with Buddhist calendar (07) in Thai locale (041E)."
msgstr ""
#: 05020301.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/shared/04.po b/source/zh-CN/helpcontent2/source/text/shared/04.po
index 155b8b14dee..2a82545a76b 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/04.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/04.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: 2017-05-09 16:45+0200\n"
+"POT-Creation-Date: 2017-05-17 15:41+0200\n"
"PO-Revision-Date: 2017-01-19 06:20+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -477,8 +477,8 @@ msgctxt ""
"01010000.xhp\n"
"par_id3148408\n"
"help.text"
-msgid "Opens <emph>Templates and Documents</emph> dialog."
-msgstr "打开<emph>模板和文档</emph>对话框。"
+msgid "Opens the <emph>Templates</emph> dialog."
+msgstr ""
#: 01010000.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/shared/guide.po b/source/zh-CN/helpcontent2/source/text/shared/guide.po
index 70cd26e464e..515ac8c06d5 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/guide.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/guide.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: 2017-05-12 14:35+0200\n"
+"POT-Creation-Date: 2017-05-18 00:25+0200\n"
"PO-Revision-Date: 2016-07-07 00:07+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,8 +69,8 @@ msgctxt ""
"aaa_start.xhp\n"
"par_id0820200803563860\n"
"help.text"
-msgid "Click the <emph>Get more templates online</emph> link in the dialog to select and download more templates."
-msgstr "单击对话框中的<emph>获得更多联机模板</emph>链接可以选择并下载更多模板。"
+msgid "Click the <emph>Browse online templates</emph> button in the dialog to select and download more templates."
+msgstr ""
#: aaa_start.xhp
msgctxt ""
@@ -17949,16 +17949,16 @@ msgctxt ""
"startcenter.xhp\n"
"par_id1022200911011855\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">The Templates icon opens the Templates and Documents dialog.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">模板图标可以打开“模板和文档”对话框。</ahelp>"
+msgid "<ahelp hid=\".\" visibility=\"hidden\">The Templates icon opens the Templates dialog.</ahelp>"
+msgstr ""
#: startcenter.xhp
msgctxt ""
"startcenter.xhp\n"
"par_id0820200803105045\n"
"help.text"
-msgid "The <emph>Templates</emph> icon opens the <link href=\"text/shared/guide/aaa_start.xhp\">Templates and Documents</link> dialog."
-msgstr "<emph>模板</emph>图标打开<link href=\"text/shared/guide/aaa_start.xhp\">模板和文挡</link>对话框。"
+msgid "The <emph>Templates</emph> icon opens the <link href=\"text/shared/guide/aaa_start.xhp\">Templates</link> dialog."
+msgstr ""
#: startcenter.xhp
msgctxt ""
@@ -18293,7 +18293,7 @@ msgctxt ""
"template_manager.xhp\n"
"hd_id041620170649101471\n"
"help.text"
-msgid "<link href=\"text/shared/guide/template_manager.xhp\">The Template Manager</link>"
+msgid "<link href=\"text/shared/guide/template_manager.xhp\">Manage Templates</link>"
msgstr ""
#: template_manager.xhp
@@ -18317,7 +18317,7 @@ msgctxt ""
"template_manager.xhp\n"
"par_id041620170723496526\n"
"help.text"
-msgid "Chose menu <item type=\"menuitem\">File – Template – Manage Templates.</item>"
+msgid "Choose menu <item type=\"menuitem\">File – Template – Manage Templates.</item>"
msgstr ""
#: template_manager.xhp
@@ -18325,7 +18325,7 @@ msgctxt ""
"template_manager.xhp\n"
"par_id041620170723493622\n"
"help.text"
-msgid "Enter <item type=\"menuitem\"><switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+N </item>in any %PRODUCTNAME module."
+msgid "Enter <switchinline select=\"sys\"><caseinline select=\"MAC\"><item type=\"menuitem\">Command</item></caseinline><defaultinline><item type=\"menuitem\">Ctrl</item></defaultinline></switchinline><item type=\"menuitem\">+Shift+N </item>in any %PRODUCTNAME module."
msgstr ""
#: template_manager.xhp
@@ -18453,7 +18453,7 @@ msgctxt ""
"template_manager.xhp\n"
"par_id041620170723504497\n"
"help.text"
-msgid "<ahelp hid=\".\">Click on the wheel icon at the bottom left to open the Settings menu.</ahelp> The options are create a New Category, Delete Category or Refresh. If a default template for new documents has been changed, an additional option to reset the factory default template is available."
+msgid "<ahelp hid=\".\">Click on the Settings icon at the bottom left to open the Settings menu.</ahelp> The options are create a New Category, Delete Category or Refresh. If a default template for new documents has been changed, an additional option to reset the factory default template is available."
msgstr ""
#: template_manager.xhp
@@ -18469,7 +18469,7 @@ msgctxt ""
"template_manager.xhp\n"
"par_id041620170723503494\n"
"help.text"
-msgid "<ahelp hid=\".\">To browse for more templates online, click on the world icon at bottom left to open a browser window and search for templates at <link href=\"https://extensions.libreoffice.org/templates\">https://extensions.libreoffice.org/templates</link>.</ahelp>"
+msgid "<ahelp hid=\".\">To browse for more templates online, click on the Browse online templates icon at bottom left to open a browser window and search for templates at <link href=\"https://templates.libreoffice.org\">https://templates.libreoffice.org</link>.</ahelp>"
msgstr ""
#: template_manager.xhp
@@ -18829,7 +18829,7 @@ msgctxt ""
"template_manager.xhp\n"
"par_id041620170723529524\n"
"help.text"
-msgid "Refer to <link href=\"https://extensions.libreoffice.org/templates\">https://extensions.libreoffice.org/templates</link> for templates to download."
+msgid "Refer to <link href=\"https://templates.libreoffice.org\">https://templates.libreoffice.org</link> for templates to download."
msgstr ""
#: text_color.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/shared/optionen.po b/source/zh-CN/helpcontent2/source/text/shared/optionen.po
index 66741d9810e..eec47a3c914 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/optionen.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/optionen.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: 2017-05-09 16:45+0200\n"
+"POT-Creation-Date: 2017-05-17 15:41+0200\n"
"PO-Revision-Date: 2017-02-23 04:19+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -10461,8 +10461,8 @@ msgctxt ""
"01070300.xhp\n"
"par_id3149177\n"
"help.text"
-msgid "If you have activated the snap grid but wish to move or create individual objects without snap positions, keep the Shift key pressed to deactivate this function for as long as needed."
-msgstr "如果您激活了坐标网格,但希望移动或创建没有坐标位置的单个对象,则可在需要时按住 Shift 键以取消激活此功能。"
+msgid "If you have activated the snap grid but wish to move or create individual objects without constraining them, keep the Shift key pressed to deactivate this function for as long as needed."
+msgstr ""
#: 01070300.xhp
msgctxt ""
@@ -10613,8 +10613,8 @@ msgctxt ""
"01070300.xhp\n"
"hd_id3150872\n"
"help.text"
-msgid "Snap position"
-msgstr "对齐位置"
+msgid "Constrain Objects"
+msgstr ""
#: 01070300.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/swriter/guide.po b/source/zh-CN/helpcontent2/source/text/swriter/guide.po
index 22104fdb2a1..1337202b1fa 100644
--- a/source/zh-CN/helpcontent2/source/text/swriter/guide.po
+++ b/source/zh-CN/helpcontent2/source/text/swriter/guide.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: 2017-05-12 14:35+0200\n"
+"POT-Creation-Date: 2017-05-18 00:24+0200\n"
"PO-Revision-Date: 2016-07-07 00:14+0000\n"
"Last-Translator: 琨珑 锁 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11493,7 +11493,7 @@ msgctxt ""
"protection.xhp\n"
"par_id18112016812973\n"
"help.text"
-msgid "To enable the protection of the whole document, go to <emph><switchinline select=\"sys\"><caseinline select=\"MAC\"><item type=\"menuitem\">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type=\"menuitem\">Tools - Options</item></defaultinline></switchinline><item type=\"menuitem\"> - %PRODUCTNAME Writer - Compatibility</item></emph> and choose <emph>Protect form</emph>. To disable protection, uncheck it."
+msgid "To enable the protection of the whole document, go to <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph><item type=\"menuitem\">%PRODUCTNAME - Preferences</item></emph></caseinline><defaultinline><emph><item type=\"menuitem\">Tools - Options</item></emph></defaultinline></switchinline><emph><item type=\"menuitem\"> - %PRODUCTNAME Writer - Compatibility</item></emph> and choose <emph>Protect form</emph>. To disable protection, uncheck it."
msgstr ""
#: protection.xhp