aboutsummaryrefslogtreecommitdiff
path: root/source/zh-CN/helpcontent2
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2020-12-08 13:52:36 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2020-12-08 13:57:41 +0100
commitb0211e02a59d2296829f5d0ce5893ddcb436b26a (patch)
tree3094b5f1e82e064421ea94ab37a7c9585194c518 /source/zh-CN/helpcontent2
parent63be3a74f7153fef6bbbfd273ae136b4aa3b84b6 (diff)
update translations for master/7.1
and force-fix errors using pocheck Change-Id: I1088dd4cc8324bd875a29446c58fe2467aa9ef9b
Diffstat (limited to 'source/zh-CN/helpcontent2')
-rw-r--r--source/zh-CN/helpcontent2/source/text/sbasic/shared.po147
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/00.po8
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/01.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/guide.po20
-rw-r--r--source/zh-CN/helpcontent2/source/text/sdraw/01.po8
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/01.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/guide.po635
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/optionen.po225
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/guide.po78
9 files changed, 481 insertions, 652 deletions
diff --git a/source/zh-CN/helpcontent2/source/text/sbasic/shared.po b/source/zh-CN/helpcontent2/source/text/sbasic/shared.po
index ec49289c2e8..72c659ee0dd 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: 2020-10-27 12:31+0100\n"
+"POT-Creation-Date: 2020-12-08 13:07+0100\n"
"PO-Revision-Date: 2019-07-10 04:02+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12814,50 +12814,41 @@ msgctxt ""
msgid "<link href=\"text/sbasic/shared/03020411.xhp\" name=\"MkDir Statement\">MkDir Statement</link>"
msgstr "<link href=\"text/sbasic/shared/03020411.xhp\" name=\"MkDir Statement\">MkDir 语句</link>"
-#. ruXou
+#. Fu6rt
#: 03020411.xhp
msgctxt ""
"03020411.xhp\n"
-"par_id3147000\n"
+"par_id971587473488701\n"
"help.text"
-msgid "Creates a new directory on a data medium."
-msgstr "在数据媒体中创建新目录。"
+msgid "<image src=\"media/helpimg/sbasic/MkDir_statement.svg\" id=\"img_id4156296484514\"><alt id=\"alt_id15152796484514\">MkDir Statement diagram</alt></image>"
+msgstr ""
-#. SehPs
+#. ruXou
#: 03020411.xhp
msgctxt ""
"03020411.xhp\n"
-"hd_id3148520\n"
+"par_id3147000\n"
"help.text"
-msgid "Syntax:"
-msgstr "语法:"
+msgid "Creates a new directory on a data medium."
+msgstr "在数据媒体中创建新目录。"
-#. xrp6D
+#. 83LPA
#: 03020411.xhp
msgctxt ""
"03020411.xhp\n"
"par_id3155150\n"
"help.text"
-msgid "MkDir Text As String"
-msgstr "MkDir Text As String"
-
-#. J4Hg2
-#: 03020411.xhp
-msgctxt ""
-"03020411.xhp\n"
-"hd_id3156027\n"
-"help.text"
-msgid "Parameters:"
-msgstr "参数:"
+msgid "MkDir path"
+msgstr ""
-#. kfraD
+#. PaEBs
#: 03020411.xhp
msgctxt ""
"03020411.xhp\n"
"par_id3153750\n"
"help.text"
-msgid "<emph>Text:</emph> Any string expression that specifies the name and path of the directory to be created. You can also use <link href=\"text/sbasic/shared/00000002.xhp\" name=\"URL notation\">URL notation</link>."
-msgstr "「<emph>Text</emph>」: 用于指定要创建目录的名称和路径的任意字符串表达式。您也可以使用 <link href=\"text/sbasic/shared/00000002.xhp\" name=\"URL 表示法\">URL 表示法</link>。"
+msgid "<emph>path:</emph> Any string expression that specifies the name and path of the directory to be created. You can also use <link href=\"text/sbasic/shared/00000002.xhp\" name=\"URL notation\">URL notation</link>."
+msgstr ""
#. PLopZ
#: 03020411.xhp
@@ -12868,15 +12859,6 @@ msgctxt ""
msgid "If the path is not determined, the directory is created in the current directory."
msgstr "如果不能确定路径,则在当前目录下创建指定的目录。"
-#. Bonqm
-#: 03020411.xhp
-msgctxt ""
-"03020411.xhp\n"
-"hd_id3155388\n"
-"help.text"
-msgid "Example:"
-msgstr "示例:"
-
#. KEaAA
#: 03020411.xhp
msgctxt ""
@@ -13138,14 +13120,14 @@ msgctxt ""
msgid "Deletes an existing directory from a data medium."
msgstr "删除数据媒介中的现有目录。"
-#. LeFHA
+#. nTJ5u
#: 03020413.xhp
msgctxt ""
"03020413.xhp\n"
-"hd_id3153361\n"
+"par_id971587473488701\n"
"help.text"
-msgid "Syntax:"
-msgstr "语法:"
+msgid "<image src=\"media/helpimg/sbasic/RmDir_statement.svg\" id=\"img_id4156296484514\"><alt id=\"alt_id15152796484514\">RmDir Statement diagram</alt></image>"
+msgstr ""
#. uE7FC
#: 03020413.xhp
@@ -13156,15 +13138,6 @@ msgctxt ""
msgid "RmDir Text As String"
msgstr "RmDir Text As String"
-#. m4L6w
-#: 03020413.xhp
-msgctxt ""
-"03020413.xhp\n"
-"hd_id3156281\n"
-"help.text"
-msgid "Parameters:"
-msgstr "参数:"
-
#. 2mpBg
#: 03020413.xhp
msgctxt ""
@@ -13183,15 +13156,6 @@ msgctxt ""
msgid "If the path is not determined, the <emph>RmDir Statement</emph> searches for the directory that you want to delete in the current path. If it is not found there, an error message appears."
msgstr "如果不能确定路径,「<emph>RmDir 语句</emph>」将在当前路径中搜索要删除的目录。如果没有找到该目录,将显示一个错误报告。"
-#. DYX4L
-#: 03020413.xhp
-msgctxt ""
-"03020413.xhp\n"
-"hd_id3145271\n"
-"help.text"
-msgid "Example:"
-msgstr "示例:"
-
#. WL5Nt
#: 03020414.xhp
msgctxt ""
@@ -24604,23 +24568,14 @@ msgctxt ""
msgid "Stops the execution of the Basic program."
msgstr "停止执行 Basic 程序。"
-#. FtjMt
-#: 03090408.xhp
-msgctxt ""
-"03090408.xhp\n"
-"hd_id3153126\n"
-"help.text"
-msgid "Syntax:"
-msgstr "语法:"
-
-#. qrBWD
+#. UECAC
#: 03090408.xhp
msgctxt ""
"03090408.xhp\n"
-"hd_id3156344\n"
+"par_id971587473488701\n"
"help.text"
-msgid "Example:"
-msgstr "示例:"
+msgid "<image src=\"media/helpimg/sbasic/Stop_statement.svg\" id=\"img_id4156296484514\"><alt id=\"alt_id15152796484514\">Stop Statement diagram</alt></image>"
+msgstr ""
#. BsgsP
#: 03090409.xhp
@@ -24856,41 +24811,50 @@ msgctxt ""
msgid "<link href=\"text/sbasic/shared/03090411.xhp\" name=\"With Statement\">With Statement</link>"
msgstr "<link href=\"text/sbasic/shared/03090411.xhp\" name=\"With Statement\">With 语句</link>"
-#. 7HE98
+#. 3GcPs
#: 03090411.xhp
msgctxt ""
"03090411.xhp\n"
"par_id3159158\n"
"help.text"
-msgid "Sets an object as the default object. Unless another object name is declared, all properties and methods refer to the default object until the End With statement is reached."
-msgstr "将某个对象设置为默认对象。除非声明其他对象名称,否则在执行到 End With 语句之前,所有属性和方法都是针对默认对象的。"
+msgid "Sets an object as the default object. Unless another object name is declared, all properties and methods refer to the default object until the <literal>End With</literal> statement is reached."
+msgstr ""
-#. vpBbV
+#. WZgyY
#: 03090411.xhp
msgctxt ""
"03090411.xhp\n"
-"hd_id3156153\n"
+"par_id491585753339474\n"
"help.text"
-msgid "Syntax:"
-msgstr "语法:"
+msgid "<image src=\"media/helpimg/sbasic/With_statement.svg\" id=\"img_id4156296484514\"><alt id=\"alt_id15152796484514\">With statement diagram</alt></image>"
+msgstr ""
-#. 742TA
+#. gnpSD
#: 03090411.xhp
msgctxt ""
"03090411.xhp\n"
-"hd_id3154924\n"
+"par_id3147560\n"
"help.text"
-msgid "Parameters:"
-msgstr "参数:"
+msgid "Use <literal>With</literal> and <literal>End With</literal> if you have several properties or methods for a single object or an extended data type definition."
+msgstr ""
-#. 3NDWr
+#. PzPzj
#: 03090411.xhp
msgctxt ""
"03090411.xhp\n"
-"par_id3147560\n"
+"par_id311606839557245\n"
+"help.text"
+msgid "Nesting <literal>With</literal> statements helps writing and reading Basic routines."
+msgstr ""
+
+#. C8YyY
+#: 03090411.xhp
+msgctxt ""
+"03090411.xhp\n"
+"par_id921606840180540\n"
"help.text"
-msgid "Use <emph>With</emph> and <emph>End With</emph> if you have several properties or methods for a single object."
-msgstr "当一个对象具有多个属性或方法时,可以使用「<emph>With</emph>」和「<emph>End With</emph>」。"
+msgid "<link href=\"text/sbasic/shared/03090413.xhp\" name=\"Type Statement\">Type Statement</link>"
+msgstr ""
#. zLuzY
#: 03090412.xhp
@@ -34099,23 +34063,14 @@ msgctxt ""
msgid "Plays a tone through the computer's speaker. The tone is system-dependent and you cannot modify its volume or pitch."
msgstr "通过计算机扬声器播放一种声音。对于不同的系统,该声音可能不同,而且您无法修改音量或音调。"
-#. ACDCD
-#: 03130100.xhp
-msgctxt ""
-"03130100.xhp\n"
-"hd_id3153990\n"
-"help.text"
-msgid "Syntax:"
-msgstr "语法:"
-
-#. 9DA89
+#. JMATz
#: 03130100.xhp
msgctxt ""
"03130100.xhp\n"
-"hd_id3148538\n"
+"par_id971587473488701\n"
"help.text"
-msgid "Example:"
-msgstr "示例:"
+msgid "<image src=\"media/helpimg/sbasic/Beep_statement.svg\" id=\"img_id4156296484514\"><alt id=\"alt_id15152796484514\">Beep Statement diagram</alt></image>"
+msgstr ""
#. 9FABw
#: 03130500.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/00.po b/source/zh-CN/helpcontent2/source/text/scalc/00.po
index db084756239..4bf622d131a 100644
--- a/source/zh-CN/helpcontent2/source/text/scalc/00.po
+++ b/source/zh-CN/helpcontent2/source/text/scalc/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: 2020-11-16 13:43+0100\n"
+"POT-Creation-Date: 2020-12-01 12:34+0100\n"
"PO-Revision-Date: 2020-11-11 21:35+0000\n"
"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
"Language-Team: Chinese (Simplified) <https://weblate.documentfoundation.org/projects/libo_help-master/textscalc00/zh_Hans/>\n"
@@ -1186,14 +1186,14 @@ msgctxt ""
msgid "<variable id=\"fete\">Choose ><item type=\"menuitem\">View - Split Window</item>.</variable>"
msgstr "<variable id=\"fete\">选择「<item type=\"menuitem\">视图 - 拆分窗口</item>」。</variable>"
-#. wQuKj
+#. q8E8w
#: 00000407.xhp
msgctxt ""
"00000407.xhp\n"
"par_id3153663\n"
"help.text"
-msgid "<variable id=\"fefix\">Choose <item type=\"menuitem\">View - Freeze Cells - Freeze Rows and Columns</item>.</variable>"
-msgstr "<variable id=\"fefix\">Choose <item type=\"menuitem\">视图 - 冻结单元格 - 冻结行列</item>。</variable>"
+msgid "<variable id=\"fefix\">Choose <item type=\"menuitem\">View - Freeze Rows and Columns</item>.</variable>"
+msgstr ""
#. BkQfX
#: 00000412.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/01.po b/source/zh-CN/helpcontent2/source/text/scalc/01.po
index 5f8815e11d4..dd183caadbe 100644
--- a/source/zh-CN/helpcontent2/source/text/scalc/01.po
+++ b/source/zh-CN/helpcontent2/source/text/scalc/01.po
@@ -4,7 +4,7 @@ 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: 2020-11-20 15:33+0100\n"
-"PO-Revision-Date: 2020-06-02 11:50+0000\n"
+"PO-Revision-Date: 2020-12-05 20:36+0000\n"
"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
"Language-Team: Chinese (Simplified) <https://weblate.documentfoundation.org/projects/libo_help-master/textscalc01/zh_Hans/>\n"
"Language: zh-CN\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Accelerator-Marker: ~\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Weblate 4.1.1\n"
"X-POOTLE-MTIME: 1565133972.000000\n"
#. sZfWF
@@ -52835,7 +52835,7 @@ msgctxt ""
"par_idN10743\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/validationcriteriapage/min\">Enter the cell range that contains the valid values or text.</ahelp>"
-msgstr "<ahelp hid=\"modules/scalc/ui/validationcriteriapage/min\">输入包包含效值或文本的单元格区域。</ahelp>"
+msgstr "<ahelp hid=\"modules/scalc/ui/validationcriteriapage/min\">输入包含有效值或文本的单元格区域。</ahelp>"
#. WDndP
#: 12120100.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/guide.po b/source/zh-CN/helpcontent2/source/text/scalc/guide.po
index c6b229643cb..151908592e6 100644
--- a/source/zh-CN/helpcontent2/source/text/scalc/guide.po
+++ b/source/zh-CN/helpcontent2/source/text/scalc/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: 2020-11-03 12:42+0100\n"
+"POT-Creation-Date: 2020-12-01 12:34+0100\n"
"PO-Revision-Date: 2019-07-10 02:32+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -7549,23 +7549,23 @@ msgctxt ""
msgid "To freeze both horizontally and vertically, select the <emph>cell</emph> that is below the row and to the right of the column that you want to freeze."
msgstr "要同时冻结行和列,请选择您要冻结的行的下部与列的右侧交叉处的「<emph>单元格</emph>」。"
-#. jSQFE
+#. Ly3Ez
#: line_fix.xhp
msgctxt ""
"line_fix.xhp\n"
"par_id3156286\n"
"help.text"
-msgid "Choose <item type=\"menuitem\">View - Freeze Cells - Freeze Rows and Columns</item>."
-msgstr "选择「<item type=\"menuitem\">视图 - 冻结单元格 - 冻结行列</item>」。"
+msgid "Choose <item type=\"menuitem\">View - Freeze Rows and Columns</item>."
+msgstr ""
-#. 3N5Vt
+#. Exqyb
#: line_fix.xhp
msgctxt ""
"line_fix.xhp\n"
"par_id3151073\n"
"help.text"
-msgid "To deactivate, choose <item type=\"menuitem\">View - Freeze Cells - Freeze Rows and Columns</item> again."
-msgstr "要解除冻结状态,请再次点击「<item type=\"menuitem\">视图 - 冻结单元格 - 冻结行列</item>」。"
+msgid "To deactivate, choose <item type=\"menuitem\">View - Freeze Rows and Columns</item> again."
+msgstr ""
#. U7GBK
#: line_fix.xhp
@@ -7585,14 +7585,14 @@ msgctxt ""
msgid "If you want to print a certain row on all pages of a document, choose <item type=\"menuitem\">Format - Print ranges - Edit</item>."
msgstr "如果您想让某些行或列在打印时出现在所有的页面上,请选择「<item type=\"menuitem\">格式 - 打印区域 - 编辑。</item>」。"
-#. jQLAq
+#. Z29B7
#: line_fix.xhp
msgctxt ""
"line_fix.xhp\n"
"par_id3147004\n"
"help.text"
-msgid "<link href=\"text/scalc/01/07090000.xhp\" name=\"View - Freeze Cells - Freeze Rows and Columns\">View - Freeze Cells - Freeze Rows and Columns</link>"
-msgstr "<link href=\"text/scalc/01/07090000.xhp\" name=\"View - Freeze Cells - Freeze Rows and Columns\">视图 - 冻结单元格 - 冻结行列</link>"
+msgid "<link href=\"text/scalc/01/07090000.xhp\" name=\"View - Freeze Cells - Freeze Rows and Columns\">View - Freeze Rows and Columns</link>"
+msgstr ""
#. RbKLt
#: line_fix.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/sdraw/01.po b/source/zh-CN/helpcontent2/source/text/sdraw/01.po
index bfc3037432c..5c5efcdb7fe 100644
--- a/source/zh-CN/helpcontent2/source/text/sdraw/01.po
+++ b/source/zh-CN/helpcontent2/source/text/sdraw/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: 2020-10-27 12:31+0100\n"
+"POT-Creation-Date: 2020-12-08 13:07+0100\n"
"PO-Revision-Date: 2019-05-14 23:37+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -916,14 +916,14 @@ msgctxt ""
msgid "<variable id=\"seiteeintext\"><ahelp hid=\".uno:PageSetup\" visibility=\"visible\">Sets page orientation, page margins, background and other layout options.</ahelp></variable>"
msgstr "<variable id=\"seiteeintext\"><ahelp hid=\".uno:PageSetup\" visibility=\"visible\">设置页面方向、页边距、背景和其他版式选项。</ahelp></variable>"
-#. hn4Vo
+#. QdVmE
#: page_properties.xhp
msgctxt ""
"page_properties.xhp\n"
"par_id691556822054550\n"
"help.text"
-msgid "To change the background of all of the pages in the active file, select a background, click <emph>OK</emph> and click <emph>Yes</emph> in the <emph>Page Setup</emph> dialog."
-msgstr "要修改活动文件中所有页面的背景,请选择一个背景,点击「<emph>确定</emph>」,然后在「<emph>页面设置</emph>」对话框中点击「<emph>是</emph>」。"
+msgid "To change the background of all of the pages in the active file, select a background, click <emph>OK</emph> and click <emph>Yes</emph> in the <emph>Page Properties</emph> dialog."
+msgstr ""
#. DA7cH
#: rename_page.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/shared/01.po b/source/zh-CN/helpcontent2/source/text/shared/01.po
index b64b37a0e30..e9f2e489d59 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: 2020-11-20 15:34+0100\n"
+"POT-Creation-Date: 2020-12-08 13:07+0100\n"
"PO-Revision-Date: 2020-02-10 17:42+0000\n"
"Last-Translator: Adolfo Jayme Barrientos <fito@libreoffice.org>\n"
"Language-Team: Chinese (Simplified) <https://weblate.documentfoundation.org/projects/libo_help-master/textshared01/zh_Hans/>\n"
@@ -7999,13 +7999,13 @@ msgctxt ""
msgid "The character represented by the eight-digit hexadecimal Unicode code (XXXXXXXX)."
msgstr ""
-#. BAX3j
+#. DkhRN
#: 02100001.xhp
msgctxt ""
"02100001.xhp\n"
"par_id3159252\n"
"help.text"
-msgid "For certain symbol fonts the Unicode code for special characters may depend on the font in use. The Unicode codes can be viewed by choosing <menuitem>Insert - Special Character</menuitem>."
+msgid "For certain symbol fonts the symbol (glyph) that you see on screen may look related to a different Unicode code than that is actually used for it in the font. The Unicode codes can be viewed by choosing <menuitem>Insert - Special Character</menuitem>, or using <link href=\"text/shared/04/01010000.xhp#unicode_shortcut\">Unicode conversion shortcut</link>."
msgstr ""
#. 6Swuu
diff --git a/source/zh-CN/helpcontent2/source/text/shared/guide.po b/source/zh-CN/helpcontent2/source/text/shared/guide.po
index abcdac80d4b..5fd055380b2 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: 2020-11-16 13:43+0100\n"
+"POT-Creation-Date: 2020-12-08 13:07+0100\n"
"PO-Revision-Date: 2019-07-10 04:02+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -97,6 +97,15 @@ msgctxt ""
msgid "<link href=\"text/shared/guide/main.xhp\" name=\"Working with %PRODUCTNAME\">Working with <item type=\"productname\">%PRODUCTNAME</item></link>"
msgstr "<link href=\"text/shared/guide/main.xhp\" name=\"使用%PRODUCTNAME\">使用「<item type=\"productname\">%PRODUCTNAME</item>」</link>"
+#. tm4Rb
+#: aaa_start.xhp
+msgctxt ""
+"aaa_start.xhp\n"
+"par_id401607339239056\n"
+"help.text"
+msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><link href=\"text/swriter/guide/template_styles.xhp\" name=\"Working with Templates\">Working with Templates</link></caseinline></switchinline>"
+msgstr ""
+
#. AJDDG
#: aaa_start.xhp
msgctxt ""
@@ -3526,15 +3535,6 @@ msgctxt ""
msgid "FictionBook 2.0"
msgstr "FictionBook 2.0"
-#. a2BeB
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_writer18\n"
-"help.text"
-msgid "HTML Document"
-msgstr "HTML 文档"
-
#. eJaKc
#: convertfilters.xhp
msgctxt ""
@@ -3778,24 +3778,6 @@ msgctxt ""
msgid "OpenDocument Text (Flat XML)"
msgstr "OpenDocument Text (纯 XML)"
-#. AFP73
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_writer90\n"
-"help.text"
-msgid "OpenOffice.org 1.0 Text Document"
-msgstr "OpenOffice.org 1.0 文本文档"
-
-#. i9gxr
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_writer93\n"
-"help.text"
-msgid "OpenOffice.org 1.0 Text Document"
-msgstr "OpenOffice.org 1.0 文本文档"
-
#. AFtGG
#: convertfilters.xhp
msgctxt ""
@@ -3805,24 +3787,6 @@ msgctxt ""
msgid "OpenOffice.org 1.0 Text Document"
msgstr "OpenOffice.org 1.0 文本文档"
-#. hVyTF
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_writer99\n"
-"help.text"
-msgid "PDF - Portable Document Format"
-msgstr "PDF - 便携式文档格式"
-
-#. 9Uskx
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_writer102\n"
-"help.text"
-msgid "PDF - Portable Document Format"
-msgstr "PDF - 便携式文档格式"
-
#. DnGzw
#: convertfilters.xhp
msgctxt ""
@@ -3877,24 +3841,6 @@ msgctxt ""
msgid "T602 Document"
msgstr "T602 文档"
-#. FZCBs
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_writer123\n"
-"help.text"
-msgid "Text"
-msgstr "文本"
-
-#. 2CRnm
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_writer126\n"
-"help.text"
-msgid "Text"
-msgstr "文本"
-
#. iEVLD
#: convertfilters.xhp
msgctxt ""
@@ -5164,15 +5110,6 @@ msgctxt ""
msgid "Filters for GRAPHICFILTER"
msgstr "供 GraphicFilter (图形筛选器) 使用的筛选器"
-#. xAas8
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter0\n"
-"help.text"
-msgid "BMP - Windows Bitmap"
-msgstr "BMP - Windows 位图"
-
#. EiDUC
#: convertfilters.xhp
msgctxt ""
@@ -5200,15 +5137,6 @@ msgctxt ""
msgid "DXF - AutoCAD Interchange Format"
msgstr "DXF - AutoCAD 交换格式"
-#. jmQnj
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter12\n"
-"help.text"
-msgid "EMF - Enhanced Meta File"
-msgstr "EMF - 增强元文件"
-
#. eFxEV
#: convertfilters.xhp
msgctxt ""
@@ -5218,15 +5146,6 @@ msgctxt ""
msgid "EMF - Enhanced Meta File"
msgstr "EMF - 增强元文件"
-#. YVkft
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter18\n"
-"help.text"
-msgid "EPS - Encapsulated PostScript"
-msgstr "EPS - 封装的 PostScript"
-
#. JSNTB
#: convertfilters.xhp
msgctxt ""
@@ -5236,15 +5155,6 @@ msgctxt ""
msgid "EPS - Encapsulated PostScript"
msgstr "EPS - 封装的 PostScript"
-#. gSAMG
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter24\n"
-"help.text"
-msgid "GIF - Graphics Interchange"
-msgstr "GIF - 图形交换格式"
-
#. w6BBX
#: convertfilters.xhp
msgctxt ""
@@ -5254,24 +5164,6 @@ msgctxt ""
msgid "GIF - Graphics Interchange"
msgstr "GIF - 图形交换格式"
-#. Ph2E4
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter30\n"
-"help.text"
-msgid "HTML"
-msgstr "HTML"
-
-#. NszLR
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter31\n"
-"help.text"
-msgid "text/html"
-msgstr "text/html"
-
#. JvkqL
#: convertfilters.xhp
msgctxt ""
@@ -5290,24 +5182,6 @@ msgctxt ""
msgid "text/html"
msgstr "text/html"
-#. uN8sR
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter36\n"
-"help.text"
-msgid "JPEG - Joint Photographic Experts Group"
-msgstr "JPEG - 联合照相专家组"
-
-#. WE2VV
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter39\n"
-"help.text"
-msgid "JPEG - Joint Photographic Experts Group"
-msgstr "JPEG - 联合照相专家组"
-
#. Fh5BC
#: convertfilters.xhp
msgctxt ""
@@ -5317,15 +5191,6 @@ msgctxt ""
msgid "JPEG - Joint Photographic Experts Group"
msgstr "JPEG - 联合照相专家组"
-#. LdLjG
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter45\n"
-"help.text"
-msgid "MET - OS/2 Metafile"
-msgstr "MET - OS/2 元文件"
-
#. NEptD
#: convertfilters.xhp
msgctxt ""
@@ -5344,15 +5209,6 @@ msgctxt ""
msgid "MOV - QuickTime File Format"
msgstr "MOV - QuickTime 文件格式"
-#. oAAov
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter60\n"
-"help.text"
-msgid "PBM - Portable Bitmap"
-msgstr "PBM - 便携式位图"
-
#. fQHzg
#: convertfilters.xhp
msgctxt ""
@@ -5389,15 +5245,6 @@ msgctxt ""
msgid "PCD - Photo CD Base4"
msgstr "PCD - Photo CD Base4"
-#. rqoXd
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter75\n"
-"help.text"
-msgid "PCT - Mac Pict"
-msgstr "PCT - Mac Pict"
-
#. Zqehv
#: convertfilters.xhp
msgctxt ""
@@ -5416,15 +5263,6 @@ msgctxt ""
msgid "PCX - Zsoft Paintbrush"
msgstr "PCX - Zsoft Paintbrush"
-#. Rp55P
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter84\n"
-"help.text"
-msgid "PGM - Portable Graymap"
-msgstr "PGM - 便携式灰图"
-
#. NT7TF
#: convertfilters.xhp
msgctxt ""
@@ -5434,33 +5272,6 @@ msgctxt ""
msgid "PGM - Portable Graymap"
msgstr "PGM - 便携式灰图"
-#. mt2GN
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter90\n"
-"help.text"
-msgid "PNG - Portable Network Graphic"
-msgstr "PNG - 便携式网络图形"
-
-#. BUCMH
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter93\n"
-"help.text"
-msgid "PNG - Portable Network Graphic"
-msgstr "PNG - 便携式网络图形"
-
-#. SDGLA
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter96\n"
-"help.text"
-msgid "PNG - Portable Network Graphic"
-msgstr "PNG - 便携式网络图形"
-
#. x2LKK
#: convertfilters.xhp
msgctxt ""
@@ -5470,15 +5281,6 @@ msgctxt ""
msgid "PNG - Portable Network Graphic"
msgstr "PNG - 便携式网络图形"
-#. QcNgF
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter102\n"
-"help.text"
-msgid "PPM - Portable Pixelmap"
-msgstr "PPM - 便携式像素图"
-
#. fZVeB
#: convertfilters.xhp
msgctxt ""
@@ -5497,15 +5299,6 @@ msgctxt ""
msgid "PSD - Adobe Photoshop"
msgstr "PSD - Adobe Photoshop"
-#. drDqU
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter111\n"
-"help.text"
-msgid "RAS - Sun Raster Image"
-msgstr "RAS - Sun Raster 图像"
-
#. hrWWf
#: convertfilters.xhp
msgctxt ""
@@ -5515,33 +5308,6 @@ msgctxt ""
msgid "RAS - Sun Raster Image"
msgstr "RAS - Sun Raster 图像"
-#. TpDxX
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter117\n"
-"help.text"
-msgid "SVG - Scalable Vector Graphics"
-msgstr "SVG - 可扩展矢量图形"
-
-#. WGwE3
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter120\n"
-"help.text"
-msgid "SVG - Scalable Vector Graphics"
-msgstr "SVG - 可扩展矢量图形"
-
-#. PHgzA
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter123\n"
-"help.text"
-msgid "SVG - Scalable Vector Graphics"
-msgstr "SVG - 可扩展矢量图形"
-
#. qYc2F
#: convertfilters.xhp
msgctxt ""
@@ -5569,15 +5335,6 @@ msgctxt ""
msgid "SVG - Scalable Vector Graphics Draw"
msgstr "SVG - 可扩展矢量图形绘图"
-#. Cr5YX
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter135\n"
-"help.text"
-msgid "SVM - StarView Meta File"
-msgstr "SVM - StarView 元文件"
-
#. XTmCR
#: convertfilters.xhp
msgctxt ""
@@ -5596,15 +5353,6 @@ msgctxt ""
msgid "TGA - Truevision Targa"
msgstr "TGA - Truevision Targa"
-#. Y3vUb
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter144\n"
-"help.text"
-msgid "TIFF - Tagged Image File Format"
-msgstr "TIFF - 带标签的图像文件格式"
-
#. rfutE
#: convertfilters.xhp
msgctxt ""
@@ -5614,15 +5362,6 @@ msgctxt ""
msgid "TIFF - Tagged Image File Format"
msgstr "TIFF - 带标签的图像文件格式"
-#. odiSU
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter150\n"
-"help.text"
-msgid "WMF - Windows Metafile"
-msgstr "WMF - Windows 元文件"
-
#. pvk6j
#: convertfilters.xhp
msgctxt ""
@@ -5641,15 +5380,6 @@ msgctxt ""
msgid "XBM - X Bitmap"
msgstr "XBM - X 位图"
-#. XZJGj
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter159\n"
-"help.text"
-msgid "XPM - X PixMap"
-msgstr "XPM - X PixMap"
-
#. 4Norn
#: convertfilters.xhp
msgctxt ""
@@ -10717,149 +10447,140 @@ msgctxt ""
msgid "In case you want to send the email to a recipient who only has software that cannot read the OpenDocument format, you can send the current document in an often used proprietary format.<br/>For a text document, choose <item type=\"menuitem\">File - Send - Email as Microsoft Word</item>. For a spreadsheet, choose <item type=\"menuitem\">File - Send - Email as Microsoft Excel</item>. And for a presentation, choose <item type=\"menuitem\">File - Send - Email as Microsoft PowerPoint</item>. <br/>If you want to send the document as a read-only file, choose <item type=\"menuitem\">File - Send - Email as PDF</item>.<br/>These commands do not change your current document. Only a temporary copy is created and sent."
msgstr ""
-#. J84BK
+#. MK28A
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
"tit\n"
"help.text"
-msgid "Error Report Tool"
-msgstr "错误报告工具"
+msgid "Crash Report Tool"
+msgstr ""
-#. kHnFB
+#. uvF7J
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
"bm_id3150616\n"
"help.text"
-msgid "<bookmark_value>Error Report Tool</bookmark_value> <bookmark_value>reports;error reports</bookmark_value> <bookmark_value>crash reports</bookmark_value> <bookmark_value>activating;Error Report Tool</bookmark_value>"
-msgstr "<bookmark_value>错误报告工具</bookmark_value> <bookmark_value>报告;错误报告</bookmark_value> <bookmark_value>崩溃报告</bookmark_value> <bookmark_value>激活;错误报告工具</bookmark_value>"
+msgid "<bookmark_value>Crash Report Tool</bookmark_value> <bookmark_value>reports;crash reports</bookmark_value> <bookmark_value>crash reports</bookmark_value> <bookmark_value>activating;Crash Report Tool</bookmark_value>"
+msgstr ""
-#. SF4pA
+#. sNc7D
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
"hd_id3150616\n"
"help.text"
-msgid "<variable id=\"error_report\"><link href=\"text/shared/guide/error_report.xhp\" name=\"Error Report Tool\">Error Report Tool</link></variable>"
-msgstr "<variable id=\"error_report\"><link href=\"text/shared/guide/error_report.xhp\" name=\"错误报告工具\">错误报告工具</link></variable>"
+msgid "<variable id=\"error_report\"><link href=\"text/shared/guide/error_report.xhp\" name=\"Error Report Tool\">Crash Report Tool</link></variable>"
+msgstr ""
-#. k3CCD
+#. ECi7s
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
"par_id3153345\n"
"help.text"
-msgid "The Error Report Tool starts automatically when a program crash occurs."
-msgstr "发生程序崩溃时,错误报告工具会自动启动。"
+msgid "The Crash Report Tool starts automatically after a program crash occurs."
+msgstr ""
-#. HahHw
+#. MGnxx
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
"par_id3147088\n"
"help.text"
-msgid "The Error Report Tool gathers all necessary information that can help the program developers to improve the code, so that in later versions this error can possibly be avoided. Please help us to improve the software and send the generated error report."
-msgstr "错误报告工具收集了所有必要的信息,供程序开发者改进程序代码,以尽可能避免在以后的版本中发生同样的错误。非常欢迎您将生成的错误报告发送给我们,以帮助我们更好地改进软件。"
+msgid "The Crash Report Tool gathers necessary information that can help the program developers to improve the code, so that in later versions this error can possibly be avoided. Please help us to improve the software and send the generated crash report."
+msgstr ""
-#. dtDXb
+#. aWFas
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
"hd_id3148538\n"
"help.text"
-msgid "Starting the Error Report Tool"
-msgstr "启动错误报告工具"
+msgid "Starting the Crash Report Tool"
+msgstr ""
-#. WYAoo
+#. nTAZD
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
"par_id3149811\n"
"help.text"
-msgid "With most program crashes the Error Report Tool will start automatically."
-msgstr "程序大部分崩溃时,错误报告工具会自动启动。"
-
-#. d4BEq
-#: error_report.xhp
-msgctxt ""
-"error_report.xhp\n"
-"hd_id3154046\n"
-"help.text"
-msgid "Completing the Report"
-msgstr "完成报告"
+msgid "With most program crashes the Crash Report Tool will start automatically."
+msgstr ""
-#. vq6k8
+#. ioZKn
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
-"par_id3147335\n"
+"hd_id3159399\n"
"help.text"
-msgid "On the main Error Report Tool dialog, you can enter some additional information that may help the developers to localize the error. For example, if the error only appears after a change in your hardware or software environment, or if you clicked on a button, please include that information."
-msgstr "在「错误报告工具」的主对话框中,可以输入一些附加信息来帮助开发者找到错误。例如,如果仅当软、硬件环境发生变化,或者点击某个按钮后才会发生错误,则请输入这些说明信息。"
+msgid "Sending the Crash Report"
+msgstr ""
-#. wuqDi
+#. QZiPi
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
-"hd_id3159399\n"
+"par_id711605615413339\n"
"help.text"
-msgid "Sending the Error Report"
-msgstr "发送错误报告"
+msgid "Select the checkbox if you want to restart %PRODUCTNAME in safe mode. Then click the <widget>Send Crash Report</widget> button."
+msgstr ""
-#. B3TEP
+#. SPdCD
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
-"par_id3150504\n"
+"par_id521605621252890\n"
"help.text"
-msgid "The Error Report Tool uses the HTTP PUT / SOAP protocol to send the report data. You may optionally enter some descriptive text that will help us to identify the context of the program crash. Then click the <emph>Send</emph> button."
-msgstr "错误报告工具在发送报告数据时使用 HTTP PUT / SOAP 协议。您可以有选择地输入一些描述性文字,以便于我们识别程序崩溃的环境。然后点击「<emph>发送</emph>」按钮。"
+msgid "If a crash report is sent successfully, then a dialog box will provide a URL for the report. To see the report, copy the URL and paste into a webbrowser."
+msgstr ""
-#. sG9KF
+#. 3PFBB
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
"par_id3149670\n"
"help.text"
-msgid "You will not get an answer to your error report. If you need support, please visit the <link href=\"text/shared/main0108.xhp\">support forum</link> on the Internet."
-msgstr "对于错误报告,我们不会回复。如果需要技术支持,请访问 Internet 上的<link href=\"text/shared/main0108.xhp\">技术支持论坛</link>。"
+msgid "You will not get an answer to your crash report. If you need support, please visit <link href=\"https://www.libreoffice.org/get-help/community-support/\">Community Assistance</link> for an overview of different possibilities."
+msgstr ""
-#. yhvCf
+#. jaz2y
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
-"par_id3153526\n"
+"hd_id3150792\n"
"help.text"
-msgid "You may choose to respond to questions that the developers may have about the reported error. Mark the check box if you want to be contacted by email, should additional information be required. By default this box is not marked, so you will not get any email."
+msgid "What Data are Sent?"
msgstr ""
-#. C7FWC
+#. CHASG
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
-"hd_id3150792\n"
+"par_id3154366\n"
"help.text"
-msgid "What Data is Sent?"
-msgstr "发送哪些数据?"
+msgid "The crash report sends information about the error type that caused the crash and the process memory contents at the time of the crash. The memory contents include: a list of loaded libraries and their version number; a list of the current threads with the contents of their stack memory and processor register states. The memory trace is gathered locally by standard system tools: <literal>dbghelp.dll</literal> on Windows systems; <literal>clone()</literal>, <literal>ptrace()</literal> and <literal>/proc</literal> directory on Linux systems; Apple's Crash Reporter on Mac systems."
+msgstr ""
-#. UESEX
+#. yu8Rq
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
-"par_id3154366\n"
+"par_id731607157836334\n"
"help.text"
-msgid "The error report consists of several files. The main file contains information about the error type, operating system name and version, memory usage, and the description that you entered. You can click the <emph>Show Report</emph> button on the main dialog of the Error Report Tool to view what will get sent in the main file."
-msgstr "错误报告由多个文件组成。主文件中含有错误类型、操作系统名称和版本、内存使用情况以及输入的说明等信息。可以点击「错误报告工具」主对话框中的「<emph>显示报告</emph>」按钮,来查看主文件中将要发送的内容。"
+msgid "Information is also sent about the %PRODUCTNAME version, the operating system name and version, and the computing hardware (CPU identification; graphics device and driver)."
+msgstr ""
-#. D4rnD
+#. oCk4J
#: error_report.xhp
msgctxt ""
"error_report.xhp\n"
-"par_id3151177\n"
+"par_id3150504\n"
"help.text"
-msgid "In addition, relevant memory contents and stack traces are gathered by some system standard tools (\"dbhhelp.dll\" on Windows systems, \"pstack\" on UNIX systems). This information will be sent also."
-msgstr "另外,某些系统标准工具 (Windows 系统中的 \"dbhhelp.dll\"、UNIX 系统中的 \"pstack\") 会收集相关的内存内容和堆栈追踪信息。此信息也会被发送。"
+msgid "The crash report is anonymous. No identification information is sent and no document content is sent. The report data are sent as a multipart HTTP POST request."
+msgstr ""
#. uD7Ga
#: export_ms.xhp
@@ -22075,32 +21796,32 @@ msgctxt ""
msgid "Remember to create one separate print job for each fax, otherwise, the first recipient will receive all the faxes. In the <emph>Tools - Mail Merge</emph> dialog select the <emph>Printer</emph> option and then select the <emph>Single print jobs</emph> check box."
msgstr "请记住为每个传真机创建单独的打印作业,否则第一个接收者将会收到所有的传真。在「<emph>工具 - 邮件合并</emph>对话框中,选择「<emph>打印机</emph>」选项,然后选中<emph>单项打印任务</emph>」复选框。"
-#. xwDxs
+#. yEpWM
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
"tit\n"
"help.text"
-msgid "Changing Default Templates"
-msgstr "修改默认模板"
+msgid "Creating and Changing Default and Custom Templates"
+msgstr ""
-#. 5rg2f
+#. CaTEi
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
"bm_id3154285\n"
"help.text"
-msgid "<bookmark_value>modifying, see changing</bookmark_value><bookmark_value>changing, see also editing and replacing</bookmark_value><bookmark_value>default templates; changing</bookmark_value><bookmark_value>defaults;documents</bookmark_value><bookmark_value>custom templates</bookmark_value><bookmark_value>updating; templates</bookmark_value><bookmark_value>editing;templates</bookmark_value><bookmark_value>templates;editing and saving</bookmark_value><bookmark_value>saving;templates</bookmark_value><bookmark_value>resetting;templates</bookmark_value>"
-msgstr "<bookmark_value>修改,参阅更改</bookmark_value><bookmark_value>更改,另请参见编辑和替换</bookmark_value><bookmark_value>默认模板; 更改</bookmark_value><bookmark_value>默认; 文档</bookmark_value><bookmark_value>自定义模板</bookmark_value><bookmark_value>更新; 模板</bookmark_value><bookmark_value>编辑; 模板</bookmark_value><bookmark_value>模板; 编辑和保存</bookmark_value><bookmark_value>保存; 模板</bookmark_value><bookmark_value>重置; 模板</bookmark_value>"
+msgid "<bookmark_value>modifying, see changing</bookmark_value><bookmark_value>changing, see also editing and replacing</bookmark_value><bookmark_value>default templates; changing</bookmark_value><bookmark_value>default templates; creating</bookmark_value><bookmark_value>defaults;documents</bookmark_value><bookmark_value>custom templates</bookmark_value><bookmark_value>updating; templates</bookmark_value><bookmark_value>editing;templates</bookmark_value><bookmark_value>templates;editing and saving</bookmark_value><bookmark_value>saving;templates</bookmark_value><bookmark_value>resetting;templates</bookmark_value>"
+msgstr ""
-#. e9Kfk
+#. fZ8SR
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
"hd_id3154285\n"
"help.text"
-msgid "<variable id=\"standard_template\"><link href=\"text/shared/guide/standard_template.xhp\" name=\"Changing Default Templates\">Changing Default Templates</link></variable>"
-msgstr "<variable id=\"standard_template\"><link href=\"text/shared/guide/standard_template.xhp\" name=\"修改默认模板\">修改默认模板</link></variable>"
+msgid "<variable id=\"standard_template\"><link href=\"text/shared/guide/standard_template.xhp\" name=\"Changing Default Templates\">Creating and Changing Default and Custom Templates</link></variable>"
+msgstr ""
#. nWgSj
#: standard_template.xhp
@@ -22111,113 +21832,239 @@ msgctxt ""
msgid "When you open a new document with <emph>File - New</emph>, a blank document appears based on a $[officename] template. You can edit, modify, or replace this template so that the new document contains your customized Styles or other contents."
msgstr "当您使用「<emph>文件 - 新建</emph>」打开一个新文档时,您就会看到一个基于 $[officename] 模板的空白文档。你可以编辑、修改或者替换模板,使文档包含您的自定义样式或其他内容。"
-#. gHw2B
+#. ESYVV
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"par_id3159152\n"
+"help.text"
+msgid "You can define document templates for each $[officename] module."
+msgstr ""
+
+#. T3xE3
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
"hd_id3150792\n"
"help.text"
-msgid "Modifying Default Templates"
-msgstr "修改默认模板"
+msgid "Creating a Default Template"
+msgstr ""
-#. yJoDH
+#. WaygD
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
"par_id3154365\n"
"help.text"
-msgid "First, open either an existing $[officename] template and modify it, or open a new document and edit it as necessary to create the desired template."
-msgstr "首先,打开现有的 $[officename] 模板并对其进行修改,或者打开新文档并根据需要对其进行编辑以创建所需模板。"
+msgid "<variable id=\"create_template\">First, open either an existing $[officename] template and modify it, or open a new document and edit it as necessary to create the desired template.</variable>"
+msgstr ""
-#. 2pSHL
+#. bnC8i
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
-"par_id3159152\n"
+"par_id3145748\n"
"help.text"
-msgid "You can define a document template for each $[officename] module. The following describes how to proceed for text documents."
-msgstr "您可以定义一个文档模板,用于每一个 $[officename] 模块。下面我们来说明用于文本文档的模板。"
+msgid "Save the document by choosing <menuitem>File - Templates - Save as Template</menuitem>, then enter the template name, click the <emph>Set as default template</emph> checkbox, and save in the <emph>My Templates</emph> category."
+msgstr ""
-#. dAATP
+#. td5TZ
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
-"par_id3145748\n"
+"par_id3146901\n"
"help.text"
-msgid "Save the document by choosing <emph>File - Templates - Save As Template</emph> and saving the document in the <emph>My Templates</emph> category."
-msgstr "选择「<emph>文件 - 模板 - 另存为模版</emph>」,将文档保存在「<emph>我的模板</emph>」类别中。"
+msgid "The next time you open a new text document, the new document will be based on this new default template."
+msgstr ""
+
+#. MEA5R
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"hd_id751605458425017\n"
+"help.text"
+msgid "Modifying a Default Template"
+msgstr ""
-#. EKAzu
+#. 7bPEX
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
"par_id3154011\n"
"help.text"
-msgid "Choose <emph>File - New - Templates</emph>."
-msgstr "选择「<emph>文件 - 新建 - 模板</emph>」。"
+msgid "<variable id=\"edit_template\">Choose <menuitem>File - Templates - Manage Templates</menuitem>.</variable>"
+msgstr ""
-#. RbKS3
+#. mhwYW
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
-"par_id3145799\n"
+"par_id531605464645795\n"
"help.text"
-msgid "Double-click <emph>My Templates</emph> in the list. You will see the user-defined templates in the user directory specified under <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - Paths</emph>. Select the template you have just saved."
-msgstr "双击列表中的「<emph>我的模版</emph>」。您将看到用户目录中的自定义模版。用户目录可在「<switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - 偏好设置</emph></caseinline><defaultinline><emph>工具 - 选项</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - 路径</emph>」中指定。选择您刚刚保存的模版。"
+msgid "Use <emph>Filter</emph> to select the type of document."
+msgstr ""
-#. 9jy7r
+#. qaBUc
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
-"par_id3146901\n"
+"par_id981605464830645\n"
"help.text"
-msgid "Choose <emph>Set as default</emph>. The next time you open a new text document, the new document will be based on the new default template."
-msgstr "选择「<emph>设为默认</emph>」。下次打开新文本文档时,新文档将基于这个新的默认模板。"
+msgid "The default template is marked with a green check mark. Right-click that template and choose <menuitem>Edit</menuitem>."
+msgstr ""
+
+#. Us6Qr
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"par_id211605464919603\n"
+"help.text"
+msgid "<variable id=\"save_template\">Make desired changes, choose <menuitem>File - Save</menuitem>, and close the document.</variable>"
+msgstr ""
+
+#. Mype2
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"par_id851605464921341\n"
+"help.text"
+msgid "When you open a new document, the modified default template will be used."
+msgstr ""
-#. GuEWL
+#. SrDht
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"par_id131605483428241\n"
+"help.text"
+msgid "%PRODUCTNAME provides built-in presentation templates, which cannot be edited, renamed, or deleted. To modify a built-in presentation template, open a document using the template, modify, then save as a new template."
+msgstr ""
+
+#. o4GyG
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"par_id461605483905608\n"
+"help.text"
+msgid "%PRODUCTNAME provides built-in templates for Writer, which cannot be edited, renamed, or deleted. To modify a built-in template, open a document using the template, modify, then save as a new template."
+msgstr ""
+
+#. S3sg4
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"hd_id891605476755142\n"
+"help.text"
+msgid "Setting a Template as Default"
+msgstr ""
+
+#. YPWzX
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"par_id501605476796634\n"
+"help.text"
+msgid "<embedvar href=\"text/shared/guide/standard_template.xhp#edit_template\"/>"
+msgstr ""
+
+#. AvnDi
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"par_id711605476873605\n"
+"help.text"
+msgid "Right-click on template to be made default, choose <menuitem>Set as Default</menuitem>."
+msgstr ""
+
+#. LNBjE
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
"hd_id3153764\n"
"help.text"
-msgid "Using Custom Templates"
-msgstr "使用自定义模板"
+msgid "Creating a Custom Template"
+msgstr ""
+
+#. eUBit
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"par_id231605475396242\n"
+"help.text"
+msgid "<embedvar href=\"text/shared/guide/standard_template.xhp#create_template\"/>"
+msgstr ""
+
+#. DuAAp
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"par_id251605475503009\n"
+"help.text"
+msgid "Choose <menuitem>File - Templates - Save As Template</menuitem>, then enter the template name, choose a <emph>Template category</emph>, and save."
+msgstr ""
+
+#. FZqGj
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"hd_id311605475738848\n"
+"help.text"
+msgid "Modifying a Custom Template"
+msgstr ""
+
+#. CpDHT
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"par_id901605475822840\n"
+"help.text"
+msgid "<embedvar href=\"text/shared/guide/standard_template.xhp#edit_template\"/>"
+msgstr ""
+
+#. 3w93A
+#: standard_template.xhp
+msgctxt ""
+"standard_template.xhp\n"
+"par_id51605476162735\n"
+"help.text"
+msgid "Right-click on the template to be modified, and choose <menuitem>Edit</menuitem>."
+msgstr ""
-#. Quf5G
+#. VMFLZ
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
-"par_id3150386\n"
+"par_id191605477448444\n"
"help.text"
-msgid "There are several ways to make your work easier by using your own custom templates."
-msgstr "通过使用自定义模板,有多种方法可以使工作变得更加简单。"
+msgid "<embedvar href=\"text/shared/guide/standard_template.xhp#save_template\"/>"
+msgstr ""
-#. S8XFP
+#. 2BZGR
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
"hd_id3149109\n"
"help.text"
-msgid "Templates in the Template Folder"
-msgstr "文档样式文件夹内的样式"
+msgid "Saving a Template in the Template Folder"
+msgstr ""
-#. 988sS
+#. eWjFn
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
"par_id3146918\n"
"help.text"
-msgid "You can save a new template with <emph>File - Templates - Save As Template</emph> or by selecting \"Template\" file type in any Save dialog. Save the template in the user directory specified under <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - Paths</emph> to be able to access the template from within the <emph>File - New - Templates</emph> dialog."
-msgstr "可以用「<emph>文件 - 模板 - 另存为模版</emph>」或在「保存」对话框中选择「模板」文件类型来保存新的模板。将模版保存在「<switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - 偏好设置</emph></caseinline><defaultinline><emph>工具 - 选项</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - 路径</emph>」指定的用户目录中,方可从「<emph>文件 - 新建 - 模板</emph>」对话框访问该模板。"
+msgid "You can save any document as a template by selecting \"Template\" file type in the Save dialog. To access the template from the Template Manager, save the template in the <emph>User Paths</emph> directory specified for <emph>Templates</emph> in <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><emph> - %PRODUCTNAME - Paths</emph>. It is often easier to save a document with <menuitem>File - Templates - Save As Template</menuitem>, because it automatically places the template in the appropriate directory."
+msgstr ""
-#. d2jxd
+#. QieZx
#: standard_template.xhp
msgctxt ""
"standard_template.xhp\n"
-"par_id3147343\n"
+"par_id271605485719890\n"
"help.text"
-msgid "To open the template for editing, choose <emph>File - New - Templates</emph>, select the template and click the <emph>Edit</emph> button."
-msgstr "要打开模版进行编辑,请选择「<emph>文件 - 新建 - 模版</emph>」,选择模版并点击「<emph>编辑</emph>」按钮。"
+msgid "The <link href=\"text/shared/guide/template_manager\" name=\"templatemanager\">Template Manager</link> is the preferred method for working with templates. <menuitem>File - New - Templates</menuitem> and <menuitem>File - Templates - Manage Templates</menuitem> are equivalent for opening the <emph>Template Manager</emph>. <keycode>Ctrl+Shift+N</keycode> is the predefined shortcut key."
+msgstr ""
#. 6YAP3
#: standard_template.xhp
@@ -24253,14 +24100,14 @@ msgctxt ""
msgid "See <link href=\"text/swriter/guide/templates_styles.xhp\">Templates and Styles</link> for related information."
msgstr "相关信息请见「<link href=\"text/swriter/guide/templates_styles.xhp\">模版与样式</link>」。"
-#. GRvCW
+#. y9WCH
#: template_manager.xhp
msgctxt ""
"template_manager.xhp\n"
"par_id041620170723523966\n"
"help.text"
-msgid "See <link href=\"text/swriter/guide/template_create.xhp\">Creating a Document Template</link> for related information."
-msgstr "相关信息请见「<link href=\"text/swriter/guide/template_create.xhp\">创建文档模版</link>」。"
+msgid "See <link href=\"text/swriter/guide/standard_template.xhp\">Creating a Document Template</link> for related information."
+msgstr ""
#. AGfmF
#: template_manager.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/shared/optionen.po b/source/zh-CN/helpcontent2/source/text/shared/optionen.po
index f0c35196857..c744344175f 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: 2020-11-20 15:34+0100\n"
+"POT-Creation-Date: 2020-12-01 12:34+0100\n"
"PO-Revision-Date: 2019-07-10 04:02+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3427,14 +3427,14 @@ msgctxt ""
msgid "View"
msgstr "视图"
-#. Ywcrn
+#. oZ2Fg
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
"bm_id3155341\n"
"help.text"
-msgid "<bookmark_value>views; defaults</bookmark_value> <bookmark_value>defaults; views</bookmark_value> <bookmark_value>settings; views</bookmark_value> <bookmark_value>icons; sizes</bookmark_value> <bookmark_value>icons; styles</bookmark_value> <bookmark_value>WYSIWYG in fonts lists</bookmark_value> <bookmark_value>previews; fonts lists</bookmark_value> <bookmark_value>font lists</bookmark_value> <bookmark_value>font name box</bookmark_value> <bookmark_value>mouse; positioning</bookmark_value> <bookmark_value>clipboard; selection clipboard</bookmark_value> <bookmark_value>selection clipboard</bookmark_value> <bookmark_value>OpenGL;settings</bookmark_value> <bookmark_value>OpenGL;blacklist</bookmark_value> <bookmark_value>OpenGL;whitelist</bookmark_value> <bookmark_value>OpenGL;graphics output</bookmark_value> <bookmark_value>notebook bar;icon size</bookmark_value>"
-msgstr "<bookmark_value>视图; 默认</bookmark_value> <bookmark_value>默认; 视图</bookmark_value> <bookmark_value>设置; 视图</bookmark_value> <bookmark_value>图标; 大小</bookmark_value> <bookmark_value>图标; 样式</bookmark_value> <bookmark_value>字体列表中的 WYSIWYG</bookmark_value> <bookmark_value>预览;字体列表</bookmark_value> <bookmark_value>字体列表</bookmark_value> <bookmark_value>字体名称框</bookmark_value> <bookmark_value>鼠标; 定位</bookmark_value> <bookmark_value>剪贴板; 选择剪贴板</bookmark_value> <bookmark_value>选择剪贴板</bookmark_value> <bookmark_value>OpenGL;设置</bookmark_value> <bookmark_value>OpenGL;黑名单</bookmark_value> <bookmark_value>OpenGL;白名单</bookmark_value> <bookmark_value>OpenGL;图形输出</bookmark_value> <bookmark_value>「笔记本」工具栏;图标大小</bookmark_value>"
+msgid "<bookmark_value>views; defaults</bookmark_value> <bookmark_value>defaults; views</bookmark_value> <bookmark_value>settings; views</bookmark_value> <bookmark_value>icons; sizes</bookmark_value> <bookmark_value>icons; styles</bookmark_value> <bookmark_value>WYSIWYG in fonts lists</bookmark_value> <bookmark_value>previews; fonts lists</bookmark_value> <bookmark_value>font lists</bookmark_value> <bookmark_value>font name box</bookmark_value> <bookmark_value>mouse; positioning</bookmark_value> <bookmark_value>mouse; middle button</bookmark_value> <bookmark_value>clipboard; selection clipboard</bookmark_value> <bookmark_value>selection clipboard</bookmark_value> <bookmark_value>Skia;settings</bookmark_value> <bookmark_value>Skia;graphics output</bookmark_value> <bookmark_value>notebook bar;icon size</bookmark_value>"
+msgstr ""
#. cGjPM
#: 01010800.xhp
@@ -3454,59 +3454,59 @@ msgctxt ""
msgid "Specifies view options."
msgstr "指定视图选项。"
-#. 8LF74
+#. M4iFj
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"hd_id310720161612581529\n"
+"hd_id310720161555238963\n"
"help.text"
-msgid "User Interface"
-msgstr "用户界面"
+msgid "Icon style"
+msgstr "图标样式"
-#. PSGxb
+#. omu6i
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"hd_id3149123\n"
+"par_id310720161555341027\n"
"help.text"
-msgid "Toolbar icon size"
-msgstr "工具栏图标大小"
+msgid "<ahelp hid=\"cui/ui/optviewpage/iconstyle\">Specifies the icon style for icons in toolbars and dialogs.</ahelp>"
+msgstr "<ahelp hid=\"cui/ui/optviewpage/iconstyle\">指定工具栏和对话框上的图标样式。</ahelp>"
-#. ENEAc
+#. wYGZr
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"par_id3153947\n"
+"hd_id310720161612581529\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/optviewpage/iconsize\">Specifies the display size of toolbar icons.</ahelp><switchinline select=\"sys\"><caseinline select=\"WIN\"> The <emph>Automatic</emph> option uses the font size settings of your operating system for menus.</caseinline></switchinline>"
-msgstr "<ahelp hid=\"cui/ui/optviewpage/iconsize\">指定工具栏中显示的图标大小。</ahelp><switchinline select=\"sys\"><caseinline select=\"WIN\">「<emph>自动</emph>」选项会为菜单使用您操作系统的字体大小。</caseinline></switchinline>"
+msgid "Icon Size"
+msgstr ""
-#. VteiP
+#. 4uDBN
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"hd_id310720161555082010\n"
+"hd_id3149123\n"
"help.text"
-msgid "Sidebar icon size"
-msgstr "侧边栏图标大小"
+msgid "Toolbar"
+msgstr ""
-#. YyspZ
+#. dwkqf
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"par_id310720161554582186\n"
+"par_id3153947\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/optviewpage/sidebariconsize\">Specifies the display size of sidebar icons.</ahelp>"
-msgstr "<ahelp hid=\"cui/ui/optviewpage/sidebariconsize\">指定侧边栏上图标的显示大小。</ahelp>"
+msgid "<ahelp hid=\"cui/ui/optviewpage/iconsize\">Specifies the display size of toolbar icons.</ahelp>"
+msgstr ""
-#. ne4jA
+#. vXois
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
"hd_id190920161822223888\n"
"help.text"
-msgid "Notebook bar icon size"
-msgstr "「笔记本」工具栏图标大小"
+msgid "Notebookbar"
+msgstr ""
#. 29iV7
#: 01010800.xhp
@@ -3517,50 +3517,68 @@ msgctxt ""
msgid "<ahelp hid=\"cui/ui/optviewpage/notebookbariconsize\">Specifies the display size of <link href=\"text/shared/01/notebook_bar.xhp\">notebook bar</link> icons.</ahelp>"
msgstr "<ahelp hid=\"cui/ui/optviewpage/notebookbariconsize\">指定<link href=\"text/shared/01/notebook_bar.xhp\">「笔记本」工具栏</link> 上显示的图标大小。</ahelp>"
-#. M4iFj
+#. CTALB
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"hd_id310720161555238963\n"
+"hd_id310720161555082010\n"
"help.text"
-msgid "Icon style"
-msgstr "图标样式"
+msgid "Sidebar"
+msgstr ""
-#. omu6i
+#. YyspZ
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"par_id310720161555341027\n"
+"par_id310720161554582186\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/optviewpage/iconstyle\">Specifies the icon style for icons in toolbars and dialogs.</ahelp>"
-msgstr "<ahelp hid=\"cui/ui/optviewpage/iconstyle\">指定工具栏和对话框上的图标样式。</ahelp>"
+msgid "<ahelp hid=\"cui/ui/optviewpage/sidebariconsize\">Specifies the display size of sidebar icons.</ahelp>"
+msgstr "<ahelp hid=\"cui/ui/optviewpage/sidebariconsize\">指定侧边栏上图标的显示大小。</ahelp>"
-#. bPXzY
+#. inCeL
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"hd_id3400982\n"
+"par_idN107A3\n"
"help.text"
-msgid "Screen font antialiasing"
-msgstr "屏幕字体抗锯齿"
+msgid "Visibility"
+msgstr ""
-#. mnNge
+#. uU7jb
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"par_id6649372\n"
+"hd_id3156056\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/optviewpage/aafont\">Select to smooth the screen appearance of text.</ahelp>"
-msgstr "<ahelp hid=\"cui/ui/optviewpage/aafont\">选择此项,可对屏幕上显示的文字进行平滑处理。</ahelp>"
+msgid "Menu icons"
+msgstr ""
-#. tckLs
+#. zqqN8
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"par_id4743797\n"
+"par_id3155766\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/optviewpage/aanf\">Enter the smallest font size to apply antialiasing.</ahelp>"
-msgstr "<ahelp hid=\"cui/ui/optviewpage/aanf\">输入要进行抗锯齿处理的最小字体大小。</ahelp>"
+msgid "<ahelp hid=\"cui/ui/optviewpage/menuicons\">Displays icons next to the corresponding menu items. Select from \"Automatic\", \"Hide\" and \"Show\". \"Automatic\" displays icons according to system settings and themes.</ahelp>"
+msgstr "<ahelp hid=\"cui/ui/optviewpage/menuicons\">在菜单项旁边显示对应的图标。可选的项有: 自动,隐藏,显示。其中,「自动」表示使用您的操作系统设置及主题的图标。</ahelp>"
+
+#. vyLbD
+#: 01010800.xhp
+msgctxt ""
+"01010800.xhp\n"
+"hd_id311605831089020\n"
+"help.text"
+msgid "Shortcuts"
+msgstr ""
+
+#. 5ECGG
+#: 01010800.xhp
+msgctxt ""
+"01010800.xhp\n"
+"par_id261605832091566\n"
+"help.text"
+msgid "Displays shortcut keys next to corresponding menu items. Select from \"Automatic\", \"Hide\", and \"Show\". \"Automatic\" displays shortcut keys according to system settings."
+msgstr ""
#. QWZyh
#: 01010800.xhp
@@ -3571,14 +3589,14 @@ msgctxt ""
msgid "Mouse"
msgstr "鼠标"
-#. TB9op
+#. yJ3aD
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
"hd_id3166432\n"
"help.text"
-msgid "Mouse positioning"
-msgstr "鼠标定位"
+msgid "Positioning"
+msgstr ""
#. aYKpK
#: 01010800.xhp
@@ -3589,14 +3607,14 @@ msgctxt ""
msgid "<ahelp hid=\"cui/ui/optviewpage/mousepos\">Specifies if and how the mouse pointer will be positioned in newly opened dialogs.</ahelp>"
msgstr "<ahelp hid=\"cui/ui/optviewpage/mousepos\">指定在新打开的对话框中,鼠标是否进行定位,以及如何进行定位。</ahelp>"
-#. cfqBE
+#. D92FV
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
"hd_id3146982\n"
"help.text"
-msgid "Middle mouse button"
-msgstr "鼠标中键"
+msgid "Middle button"
+msgstr ""
#. 6Qe9V
#: 01010800.xhp
@@ -3733,23 +3751,23 @@ msgctxt ""
msgid "The last marked selection is the content of the selection clipboard."
msgstr "「选择剪贴板」中的内容,是最近一次标记选取的内容。"
-#. QXP9N
+#. dKU6i
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"par_idN10AC8\n"
+"par_idN10A1D\n"
"help.text"
-msgid "Graphics output"
-msgstr "图形输出"
+msgid "<ahelp hid=\"20201\">Press Shift+Ctrl+R to restore or refresh the view of the current document.</ahelp>"
+msgstr "<ahelp hid=\"20201\">按 Shift+Ctrl+R 键可恢复或刷新当前文档的视图。</ahelp>"
-#. dKU6i
+#. 9BPVM
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"par_idN10A1D\n"
+"par_idN10AC8\n"
"help.text"
-msgid "<ahelp hid=\"20201\">Press Shift+Ctrl+R to restore or refresh the view of the current document.</ahelp>"
-msgstr "<ahelp hid=\"20201\">按 Shift+Ctrl+R 键可恢复或刷新当前文档的视图。</ahelp>"
+msgid "Graphics Output"
+msgstr ""
#. WzMq5
#: 01010800.xhp
@@ -3787,68 +3805,59 @@ msgctxt ""
msgid "<ahelp hid=\"cui/ui/optviewpage/useaa\">When supported, you can enable and disable anti-aliasing of graphics. With anti-aliasing enabled, the display of most graphical objects looks smoother and with less artifacts.</ahelp>"
msgstr "<ahelp hid=\"cui/ui/optviewpage/useaa\">如果支持的话,您可以启用/禁用图形的反锯齿。启用反锯齿后,大部分图形对象看上去会更平滑,瑕疵更少。</ahelp>"
-#. Au8eb
+#. N8g8U
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
"hd_id1208200812004471\n"
"help.text"
-msgid "Use OpenGL for all rendering (on restart)"
-msgstr "为所有渲染启用 OpenGL (需要重启程序)"
+msgid "Use Skia for all rendering (on restart)"
+msgstr ""
-#. F4SNo
+#. neuEJ
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
"par_id1208200812004445\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/optviewpage/useopengl\">Use the high performance Open Graphics Library (<link href=\"text/shared/00/00000005.xhp\" name=\"opengl\">OpenGL</link>) to render all visual elements of the application, including windows, menus, toolbars and icons.</ahelp> OpenGL uses the computer graphics device to accelerate the graphics rendering. If the device is blacklisted (see below) this option will not be effective."
-msgstr "<ahelp hid=\"cui/ui/optviewpage/useopengl\">在程序中使用性能更好的「Open Graphics Library」(<link href=\"text/shared/00/00000005.xhp\" name=\"opengl\">OpenGL</link>) 对界面上的所有可见元素进行渲染,包括桌面、菜单、工具栏以及图标。</ahelp>OpenGL 使用图形设备 (显卡) 对渲染进行加速处理。但是,如果您系统上的显卡被加入了黑名单 (见下面的内容),那么该选项即使启用也不会生效。"
+msgid "<ahelp hid=\"cui/ui/optviewpage/useopengl\">Use the high performance Skia graphics engine to render all visual elements of the application, including windows, menus, toolbars and icons.</ahelp> Skia uses the computer graphics device to accelerate the graphics rendering."
+msgstr ""
-#. mgCcb
+#. tF5EX
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
"hd_id1208200812004472\n"
"help.text"
-msgid "Force OpenGL even if blacklisted (on restart)"
-msgstr "忽略 OpenGL 黑名单 (需要重启程序)"
+msgid "Force Skia software rendering (on restart)"
+msgstr ""
-#. p4bDK
+#. 3TFwM
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
"par_id1208200812004446\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/optviewpage/forceopengl\">Forces the use of OpenGL even if the graphics device is blacklisted.</ahelp> A device is blacklisted when it is buggy or may render graphics with poor quality."
-msgstr "<ahelp hid=\"cui/ui/optviewpage/forceopengl\">强制使用 OpenGL 进行渲染,即使您的显卡已被加入黑名单。</ahelp>被加入黑名单的显卡设备通常存在缺陷,或渲染图形的质量很差。"
-
-#. CTQcx
-#: 01010800.xhp
-msgctxt ""
-"01010800.xhp\n"
-"par_idN107A3\n"
-"help.text"
-msgid "Menu"
-msgstr "菜单"
+msgid "<ahelp hid=\"cui/ui/optviewpage/forceopengl\">Select this control to disable Skia's use of the computer graphics device.</ahelp>"
+msgstr ""
-#. WnNCQ
+#. CSJCp
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"hd_id3156056\n"
+"par_id951606170938129\n"
"help.text"
-msgid "Icons in menus"
-msgstr "菜单上的图标"
+msgid "During installation, %PRODUCTNAME chooses the best options for configuring the Skia graphics engine. Normally you do not need to change the default settings if Skia is enabled."
+msgstr ""
-#. zqqN8
+#. Berbx
#: 01010800.xhp
msgctxt ""
"01010800.xhp\n"
-"par_id3155766\n"
+"par_id361606171335950\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/optviewpage/menuicons\">Displays icons next to the corresponding menu items. Select from \"Automatic\", \"Hide\" and \"Show\". \"Automatic\" displays icons according to system settings and themes.</ahelp>"
-msgstr "<ahelp hid=\"cui/ui/optviewpage/menuicons\">在菜单项旁边显示对应的图标。可选的项有: 自动,隐藏,显示。其中,「自动」表示使用您的操作系统设置及主题的图标。</ahelp>"
+msgid "If you experience graphical display problems (e.g., with the appearance of toolbar icons or drawing objects) and Skia is enabled, then you can try to disable <emph>Force Skia software rendering</emph> or disable Skia entirely."
+msgstr ""
#. wPnrb
#: 01010800.xhp
@@ -3877,6 +3886,42 @@ msgctxt ""
msgid "<ahelp hid=\"cui/ui/optviewpage/showfontpreview\">Displays the names of selectable fonts in the corresponding font, for example, fonts in the Font box on the <emph>Formatting</emph> bar.</ahelp>"
msgstr "<ahelp hid=\"cui/ui/optviewpage/showfontpreview\">在相应的界面中显示字体名称的效果预览,比如在「<emph>格式</emph>」工具栏的字体框中。</ahelp>"
+#. bPXzY
+#: 01010800.xhp
+msgctxt ""
+"01010800.xhp\n"
+"hd_id3400982\n"
+"help.text"
+msgid "Screen font antialiasing"
+msgstr "屏幕字体抗锯齿"
+
+#. mnNge
+#: 01010800.xhp
+msgctxt ""
+"01010800.xhp\n"
+"par_id6649372\n"
+"help.text"
+msgid "<ahelp hid=\"cui/ui/optviewpage/aafont\">Select to smooth the screen appearance of text.</ahelp>"
+msgstr "<ahelp hid=\"cui/ui/optviewpage/aafont\">选择此项,可对屏幕上显示的文字进行平滑处理。</ahelp>"
+
+#. eNJhS
+#: 01010800.xhp
+msgctxt ""
+"01010800.xhp\n"
+"hd_id451605831585825\n"
+"help.text"
+msgid "from"
+msgstr ""
+
+#. tckLs
+#: 01010800.xhp
+msgctxt ""
+"01010800.xhp\n"
+"par_id4743797\n"
+"help.text"
+msgid "<ahelp hid=\"cui/ui/optviewpage/aanf\">Enter the smallest font size to apply antialiasing.</ahelp>"
+msgstr "<ahelp hid=\"cui/ui/optviewpage/aanf\">输入要进行抗锯齿处理的最小字体大小。</ahelp>"
+
#. 2Z5jk
#: 01010900.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 6932f86828e..cd10942f5d7 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: 2020-11-22 12:51+0100\n"
+"POT-Creation-Date: 2020-12-08 13:07+0100\n"
"PO-Revision-Date: 2019-07-10 03:15+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12517,13 +12517,13 @@ msgctxt ""
msgid "Printing a single page"
msgstr ""
-#. KhpCc
+#. nFVLk
#: print_selection.xhp
msgctxt ""
"print_selection.xhp\n"
"par_id571605684186001\n"
"help.text"
-msgid "Choose <menuitem>File > Print</menuitem> to open the <emph>Print</emph> dialog."
+msgid "Choose <menuitem>File - Print</menuitem> to open the <emph>Print</emph> dialog."
msgstr ""
#. 2GBM8
@@ -12562,13 +12562,13 @@ msgctxt ""
msgid "Printing a range of pages"
msgstr ""
-#. DBQVy
+#. xdCdZ
#: print_selection.xhp
msgctxt ""
"print_selection.xhp\n"
"par_id731605685039891\n"
"help.text"
-msgid "Choose <menuitem>File > Print</menuitem> to open the <emph>Print</emph> dialog."
+msgid "Choose <menuitem>File - Print</menuitem> to open the <emph>Print</emph> dialog."
msgstr ""
#. hWBFk
@@ -12589,58 +12589,40 @@ msgctxt ""
msgid "Enter the page numbers to print."
msgstr ""
-#. 5iRGH
+#. 5D8g2
#: print_selection.xhp
msgctxt ""
"print_selection.xhp\n"
"par_id481605270284520\n"
"help.text"
-msgid "• Use <literal>-</literal> for a range of pages (e.g., <input>1–4</input> will print all pages from 1 to 4)."
+msgid "Use <literal>-</literal> for a range of pages. For example, <input>1-4</input> prints all pages from 1 to 4."
msgstr ""
-#. RfLAA
+#. AShg2
#: print_selection.xhp
msgctxt ""
"print_selection.xhp\n"
"par_id651605685305228\n"
"help.text"
-msgid "• Partial ranges are also permitted."
+msgid "Partial ranges are also allowed: <input>-5</input> prints all pages up to page 5; <input>10-</input> prints from page 10 to end of document."
msgstr ""
-#. Bugra
-#: print_selection.xhp
-msgctxt ""
-"print_selection.xhp\n"
-"par_id781605686618241\n"
-"help.text"
-msgid "<input>-5</input> prints all pages up to page 5."
-msgstr ""
-
-#. eQhF4
-#: print_selection.xhp
-msgctxt ""
-"print_selection.xhp\n"
-"par_id741605686988056\n"
-"help.text"
-msgid "<input>10-</input> prints from page 10 to end of document."
-msgstr ""
-
-#. wcTVv
+#. WBqMB
#: print_selection.xhp
msgctxt ""
"print_selection.xhp\n"
"par_id951605270474391\n"
"help.text"
-msgid "• Use <literal>,</literal> or <literal>;</literal> for a list of pages (e.g., <input> 1,3;7</input> will print pages 1, 3 and 7. Spaces are optional. 1, 3, 7 will also work)."
+msgid "Use <literal>,</literal> or <literal>;</literal> for a list of pages. For example, <input>1,3;7</input> prints pages 1, 3 and 7. Spaces are optional: <input>1, 3, 7</input> also works."
msgstr ""
-#. GzqGZ
+#. EAR8E
#: print_selection.xhp
msgctxt ""
"print_selection.xhp\n"
"par_id611605270697509\n"
"help.text"
-msgid "• Combinations are also possible (e.g., <input>1, 3, 5-10, 15-</input> will print pages 1,3, 5 through 10, and 15 to end of document."
+msgid "Combinations are also possible. For example, <input>1, 3, 5-10, 15-</input> prints pages 1,3, 5 to 10, and 15 to end of document."
msgstr ""
#. FRjsx
@@ -12670,13 +12652,13 @@ msgctxt ""
msgid "Select the content to print."
msgstr ""
-#. mwEd6
+#. Q82VP
#: print_selection.xhp
msgctxt ""
"print_selection.xhp\n"
"par_id481605687683495\n"
"help.text"
-msgid "Choose <menuitem>File > Print</menuitem> to open the <emph>Print</emph> dialog."
+msgid "Choose <menuitem>File - Print</menuitem> to open the <emph>Print</emph> dialog."
msgstr ""
#. iaYKz
@@ -16909,14 +16891,14 @@ msgctxt ""
msgid "Unless you specify otherwise, every new $[officename] text document is based on the default template."
msgstr "除非另外指定,否则,每个新 $[officename] 文本文档都基于默认模板。"
-#. J9VB2
+#. UXnRC
#: templates_styles.xhp
msgctxt ""
"templates_styles.xhp\n"
"par_id3149974\n"
"help.text"
-msgid "$[officename] has a number of <link href=\"text/swriter/01/05130000.xhp\" name=\"predefined templates\">predefined templates</link> that you can use to create different types or text documents, such as business letters."
-msgstr "$[officename] 具有大量的<link href=\"text/swriter/01/05130000.xhp\" name=\"预定义模板\">预定义模板</link> ,使用这些模板可以创建各种类型或文本的文档,例如商务信函。"
+msgid "$[officename] has a number of predefined templates that you can use to create different types of text documents, such as business letters."
+msgstr ""
#. VFfAP
#: text_animation.xhp
@@ -17269,14 +17251,14 @@ msgctxt ""
msgid "To set the behavior of the direct cursor, choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Formatting Aids</emph>."
msgstr "要设置直接光标的行为,请选择「<switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - 偏好设置</emph></caseinline><defaultinline><emph>工具 - 选项</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - 格式化辅助</emph>」。"
-#. D2Qjq
+#. bNK8D
#: text_direct_cursor.xhp
msgctxt ""
"text_direct_cursor.xhp\n"
"par_idN106A3\n"
"help.text"
-msgid "On the <item type=\"menuitem\">Tools</item> bar, click the <item type=\"menuitem\">Direct Cursor</item> icon <image id=\"img_id3149846\" src=\"cmd/sc_shadowcursor.png\" width=\"0.222in\" height=\"0.222in\"><alt id=\"alt_id3149846\">Icon</alt></image>."
-msgstr "在「<item type=\"menuitem\">工具</item>」栏上,点击「<item type=\"menuitem\">直接定位光标</item>」图标 <image id=\"img_id3149846\" src=\"cmd/sc_shadowcursor.png\" width=\"0.222in\" height=\"0.222in\"><alt id=\"alt_id3149846\">图标</alt></image>。"
+msgid "On the <item type=\"menuitem\">Tools</item> bar, click the <item type=\"menuitem\">Direct Cursor</item> icon <image id=\"img_id3149846\" src=\"cmd/sc_shadowcursor.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3149846\">Icon</alt></image>."
+msgstr ""
#. AmitQ
#: text_direct_cursor.xhp
@@ -17287,32 +17269,32 @@ msgctxt ""
msgid "Click in a free space in the text document. The mouse pointer changes to reflect the alignment that will be applied to the text that you type:"
msgstr "在文本文档中的空白位置点击。鼠标指针将发生变化,以反映输入的文本所应用的对齐方式:"
-#. hWZqk
+#. 4qwJ9
#: text_direct_cursor.xhp
msgctxt ""
"text_direct_cursor.xhp\n"
"par_idN106C8\n"
"help.text"
-msgid "<image id=\"img_id5471987\" src=\"media/helpimg/dircursleft.png\" width=\"0.1457in\" height=\"0.3228in\"><alt id=\"alt_id5471987\">Icon</alt></image> Align left"
-msgstr "<image id=\"img_id5471987\" src=\"media/helpimg/dircursleft.png\" width=\"0.1457in\" height=\"0.3228in\"><alt id=\"alt_id5471987\">图标</alt></image>左对齐"
+msgid "<image id=\"img_id5471987\" src=\"media/helpimg/dircursleft.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id5471987\">Icon</alt></image> Align left"
+msgstr ""
-#. 3A8HV
+#. CSXBU
#: text_direct_cursor.xhp
msgctxt ""
"text_direct_cursor.xhp\n"
"par_idN106E4\n"
"help.text"
-msgid "<image id=\"img_id5730253\" src=\"media/helpimg/dircurscent.png\" width=\"0.2398in\" height=\"0.3228in\"><alt id=\"alt_id5730253\">Icon</alt></image> Centered"
-msgstr "<image id=\"img_id5730253\" src=\"media/helpimg/dircurscent.png\" width=\"0.2398in\" height=\"0.3228in\"><alt id=\"alt_id5730253\">图标</alt></image> 居中"
+msgid "<image id=\"img_id5730253\" src=\"media/helpimg/dircurscent.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id5730253\">Icon</alt></image> Centered"
+msgstr ""
-#. txU6C
+#. XcT6v
#: text_direct_cursor.xhp
msgctxt ""
"text_direct_cursor.xhp\n"
"par_idN10700\n"
"help.text"
-msgid "<image id=\"img_id6953622\" src=\"media/helpimg/dircursright.png\" width=\"0.1563in\" height=\"0.3228in\"><alt id=\"alt_id6953622\">Icon</alt></image> Align right"
-msgstr "<image id=\"img_id6953622\" src=\"media/helpimg/dircursright.png\" width=\"0.1563in\" height=\"0.3228in\"><alt id=\"alt_id6953622\">图标</alt></image> 右对齐"
+msgid "<image id=\"img_id6953622\" src=\"media/helpimg/dircursright.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id6953622\">Icon</alt></image> Align right"
+msgstr ""
#. EuMGF
#: text_direct_cursor.xhp