aboutsummaryrefslogtreecommitdiff
path: root/source/zh-CN/helpcontent2
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-11-22 19:49:53 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-11-22 21:16:52 +0100
commita0c08eb77f9fd9e3b53f5c40abb554e83195fa27 (patch)
treeec34632ef821ea59ef481bdc4b43fb0192fd17bd /source/zh-CN/helpcontent2
parente113c687b97d0f1b3b5a0afdddc04d2de33edb20 (diff)
update translations for 6.0 beta1
and force-fix errors using pocheck Change-Id: Ie5900800b8c1f0e6064d00b2b028afcf51e84e20
Diffstat (limited to 'source/zh-CN/helpcontent2')
-rw-r--r--source/zh-CN/helpcontent2/source/text/sbasic/shared.po4
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/00.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/01.po98
-rw-r--r--source/zh-CN/helpcontent2/source/text/schart/01.po30
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/00.po42
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/01.po174
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/02.po14
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/05.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/autopi.po66
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/guide.po36
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/optionen.po40
-rw-r--r--source/zh-CN/helpcontent2/source/text/simpress/guide.po4
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/00.po10
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/01.po30
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/02.po18
16 files changed, 328 insertions, 256 deletions
diff --git a/source/zh-CN/helpcontent2/source/text/sbasic/shared.po b/source/zh-CN/helpcontent2/source/text/sbasic/shared.po
index 6aacceae3a5..30522084ef1 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-10-04 11:48+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\n"
"PO-Revision-Date: 2017-09-05 06:12+0000\n"
"Last-Translator: cnzhx <zhx@cnzhx.net>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33869,7 +33869,7 @@ msgctxt ""
"03140009.xhp\n"
"par_id061420170420246794\n"
"help.text"
-msgid "<emph>P</emph><emph>mt</emph> is the regular payment made per period."
+msgid "<emph>Pmt</emph> is the regular payment made per period."
msgstr ""
#: 03140009.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/00.po b/source/zh-CN/helpcontent2/source/text/scalc/00.po
index 0b11faddc45..8ad39e573d0 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: 2017-05-30 09:54+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\n"
"PO-Revision-Date: 2017-02-20 02:39+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -133,8 +133,8 @@ msgctxt ""
"00000402.xhp\n"
"par_id3150400\n"
"help.text"
-msgid "<variable id=\"baustab\">Choose <emph>Sheet - Fill Cells - Sheet</emph></variable>"
-msgstr "<variable id=\"baustab\">选择 <emph>工作表 - 填充单元格 - 工作表</emph></variable>"
+msgid "<variable id=\"baustab\">Choose <emph>Sheet - Fill Cells - Sheets</emph></variable>"
+msgstr ""
#: 00000402.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/01.po b/source/zh-CN/helpcontent2/source/text/scalc/01.po
index 448eae5bdb3..4dc6efcd310 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-10-04 11:48+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\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"
@@ -1077,32 +1077,48 @@ msgctxt ""
"02140500.xhp\n"
"tit\n"
"help.text"
-msgid "Fill Sheet"
-msgstr "填充工作表"
+msgid "Fill Sheets"
+msgstr ""
#: 02140500.xhp
msgctxt ""
"02140500.xhp\n"
"hd_id3153897\n"
"help.text"
-msgid "Fill Sheet"
-msgstr "填充工作表"
+msgid "Fill Sheets"
+msgstr ""
#: 02140500.xhp
msgctxt ""
"02140500.xhp\n"
"par_id3150791\n"
"help.text"
-msgid "<variable id=\"tabellenfuellentext\"><ahelp hid=\".uno:FillTable\" visibility=\"visible\">Specifies the options for transferring sheets or ranges of a certain sheet.</ahelp></variable>"
-msgstr "<variable id=\"tabellenfuellentext\"><ahelp hid=\".uno:FillTable\" visibility=\"visible\">指定有关转换整个工作表或其中某些区域的选项。</ahelp></variable>"
+msgid "<variable id=\"tabellenfuellentext\"><ahelp hid=\".uno:FillTable\">Specifies the options for transferring sheets or ranges of a certain sheet to the same cells on other selected sheets.</ahelp></variable>"
+msgstr ""
+
+#: 02140500.xhp
+msgctxt ""
+"02140500.xhp\n"
+"par_id3150768\n"
+"help.text"
+msgid "This menu command is only active if you have selected at least two sheets in the document."
+msgstr ""
+
+#: 02140500.xhp
+msgctxt ""
+"02140500.xhp\n"
+"par_id3150769\n"
+"help.text"
+msgid "To select multiple sheets, click each sheet tab while pressing <switchinline select=\"sys\"> <caseinline select=\"MAC\">Command</caseinline> <defaultinline>Ctrl</defaultinline> </switchinline> or Shift."
+msgstr ""
#: 02140500.xhp
msgctxt ""
"02140500.xhp\n"
"par_id3150767\n"
"help.text"
-msgid "In contrast to copying an area to the clipboard, you can filter certain information and calculate values. This command is only visible if you have selected two sheets in the document. To select multiple sheets, click each sheet tab while pressing <switchinline select=\"sys\"> <caseinline select=\"MAC\">Command</caseinline> <defaultinline>Ctrl</defaultinline> </switchinline> or Shift."
-msgstr "与复制区域到剪贴板不同,您可以筛选某些信息和计算数值。只有当你在文档中选定了两个工作表时,这个指令才有效。要选择多个工作表,请在按下<switchinline select=\"sys\"> <caseinline select=\"MAC\">命令</caseinline> <defaultinline>Ctrl</defaultinline> </switchinline> 键或者 Shift 键的同时单击工作表标签。"
+msgid "In contrast to copying an area to the clipboard, you can filter certain information and calculate values."
+msgstr ""
#: 02140500.xhp
msgctxt ""
@@ -1133,8 +1149,8 @@ msgctxt ""
"02140500.xhp\n"
"par_id3147436\n"
"help.text"
-msgid "Select the command <emph>Edit - Fill - Sheet</emph>. In the dialog which appears, the check box <emph>Numbers</emph> must be selected (or <emph>Paste All</emph>) if you want to combine operations with the values. You can also choose the desired operation here."
-msgstr "选择<emph>编辑 - 填充 - 工作表</emph>命令。在显示的对话框中,如果您要组合计算数值,必须选择<emph>数字</emph>选择框(或者<emph>全部粘贴</emph>)。您也可以在此选择所需的操作。"
+msgid "Select the command <emph>Sheet - Fill Cells - Sheets</emph>. In the dialog which appears, the check box <emph>Numbers</emph> must be selected (or <emph>Paste All</emph>) if you want to combine operations with the values. You can also choose the desired operation here."
+msgstr ""
#: 02140500.xhp
msgctxt ""
@@ -1149,8 +1165,8 @@ msgctxt ""
"02140500.xhp\n"
"par_id3156283\n"
"help.text"
-msgid "This dialog is similar to the <link href=\"text/shared/01/02070000.xhp\" name=\"Paste Contents\">Paste Contents</link> dialog, where you can find additional tips."
-msgstr "这个对话框和<link href=\"text/shared/01/02070000.xhp\" name=\"粘贴内容\">粘贴内容</link>对话框的内容相似,您可以在其中找到附加的提示。"
+msgid "This dialog is similar to the <link href=\"text/shared/01/02070000.xhp\" name=\"Paste Special\">Paste Special</link> dialog, where you can find additional tips."
+msgstr ""
#: 02140600.xhp
msgctxt ""
@@ -1509,8 +1525,8 @@ msgctxt ""
"02140700.xhp\n"
"par_id2308201415431525817\n"
"help.text"
-msgid "Populate a cell range with automatically generated pseudo random numbers with the selected distribution function and its parameters."
-msgstr "用自动生成的伪随机数填充单元格区域,您可以选择随机数生成时所使用的分布函数及其参数。"
+msgid "<ahelp hid=\".\">Populate a cell range with automatically generated pseudo random numbers with the selected distribution function and its parameters.</ahelp>"
+msgstr ""
#: 02140700.xhp
msgctxt ""
@@ -1525,8 +1541,8 @@ msgctxt ""
"02140700.xhp\n"
"par_id2308201415500176457\n"
"help.text"
-msgid "Menu <item type=\"menuitem\">Edit – Fill – Random Numbers</item>"
-msgstr "<item type=\"menuitem\">编辑 – 填充 – 随机数</item>菜单"
+msgid "Choose <item type=\"menuitem\">Sheet - Fill Cells - Random Number</item>"
+msgstr ""
#: 02140700.xhp
msgctxt ""
@@ -1549,8 +1565,8 @@ msgctxt ""
"02140700.xhp\n"
"par_id2308201415431811111\n"
"help.text"
-msgid "Define the range of cells to fill with random numbers. If you have previously selected a range, it will be displayed here."
-msgstr "设定要用随机数填充的单元格区域。如果您之前选择了一个区域,它将会在此处显示。"
+msgid "<ahelp hid=\".\">Define the range of cells to fill with random numbers. If you have previously selected a range, it will be displayed here.</ahelp>"
+msgstr ""
#: 02140700.xhp
msgctxt ""
@@ -1829,8 +1845,8 @@ msgctxt ""
"02140700.xhp\n"
"par_id2308201415431841782\n"
"help.text"
-msgid "Set the initial value of the random number generator to a known value <emph>Seed.</emph>"
-msgstr "将随机数生成器的初始值设定为给定的值<emph>seed</emph>。"
+msgid "<ahelp hid=\".\">Set the initial value of the random number generator to a known value <emph>Seed.</emph></ahelp>"
+msgstr ""
#: 02140700.xhp
msgctxt ""
@@ -1845,8 +1861,8 @@ msgctxt ""
"02140700.xhp\n"
"par_id2308201415431834837\n"
"help.text"
-msgid "Value set to initiate the random number generator algorithm. It is used to initialize (seed) the random number generator in order to reproduce the same sequence of pseudorandom numbers. Specify a positive integer number (1, 2, ...) to produce a specific sequence, or leave the field blank if you don't need this particular feature."
-msgstr "用于初始化随机数生成器算法的值。该值被用于初始化 (seed) 随机数生成器,以便生成相同序列的伪随机数。指定一个正整数 (1, 2, ...) 以生成一个特定的序列;若您不需要该功能,请留空。"
+msgid "<ahelp hid=\".\">Value set to initiate the random number generator algorithm. It is used to initialize (seed) the random number generator in order to reproduce the same sequence of pseudorandom numbers. Specify a positive integer number (1, 2, ...) to produce a specific sequence, or leave the field blank if you don't need this particular feature.</ahelp>"
+msgstr ""
#: 02140700.xhp
msgctxt ""
@@ -1861,8 +1877,8 @@ msgctxt ""
"02140700.xhp\n"
"par_id2308201415431822157\n"
"help.text"
-msgid "Truncate the number to a given number of <emph>Decimal Places</emph>."
-msgstr "将数字按照给定的<emph>小数位数</emph>截断。"
+msgid "<ahelp hid=\".\">Truncate the number to a given number of <emph>Decimal Places</emph>.</ahelp>"
+msgstr ""
#: 02140700.xhp
msgctxt ""
@@ -1877,8 +1893,8 @@ msgctxt ""
"02140700.xhp\n"
"par_id2308201415431820502\n"
"help.text"
-msgid "Number of decimal places of the numbers generated."
-msgstr "生成的数字的小数位数。"
+msgid "<ahelp hid=\".\">Number of decimal places of the numbers generated.</ahelp>"
+msgstr ""
#: 02150000.xhp
msgctxt ""
@@ -2245,8 +2261,8 @@ msgctxt ""
"02170000.xhp\n"
"par_id3145801\n"
"help.text"
-msgid "You cannot delete a sheet while <emph>Edit - Track Changes - Record Changes</emph> is activated."
-msgstr "当<emph>编辑 - 追踪修订 - 记录更改</emph>启用时,您不能删除工作表。"
+msgid "You cannot delete a sheet while <emph>Edit - Track Changes - Record</emph> is activated."
+msgstr ""
#: 02170000.xhp
msgctxt ""
@@ -20781,8 +20797,8 @@ msgctxt ""
"04060109.xhp\n"
"par_id3150826\n"
"help.text"
-msgid "<ahelp hid=\"HID_FUNC_VORLAGE\">Applies a style to the cell containing the formula.</ahelp> After a set amount of time, another style can be applied. This function always returns the value 0, allowing you to add it to another function without changing the value. Together with the CURRENT function you can apply a color to a cell regardless of the value. For example: =...+STYLE(IF(CURRENT()>3;\"red\";\"green\")) applies the style \"red\" to the cell if the value is greater than 3, otherwise the style \"green\" is applied. Both cell formats have to be defined beforehand."
-msgstr "<ahelp hid=\"HID_FUNC_VORLAGE\">将样式应用到包含公式的单元格。</ahelp> 一定时间之后,可以再应用另一个样式。此函数始终返回值 0,您可以将该值原封不动地添加到另一个函数中。与 CURRENT 函数一起使用可以将颜色应用到单元格,而不受该值的影响。例如:=...+STYLE(IF(CURRENT()>3;\"red\";\"green\")) 在值大于 3 时将样式\"红色\"应用到单元格,否则应用\"绿色\"。两种单元格格式都必须预先定义。"
+msgid "<ahelp hid=\"HID_FUNC_VORLAGE\">Applies a style to the cell containing the formula.</ahelp> After a set amount of time, another style can be applied. This function always returns the value 0, allowing you to add it to another function without changing the value. Together with the CURRENT function you can apply a color to a cell depending on the value. For example: =...+STYLE(IF(CURRENT()>3;\"red\";\"green\")) applies the style \"red\" to the cell if the value is greater than 3, otherwise the style \"green\" is applied. Both cell formats have to be defined beforehand."
+msgstr ""
#: 04060109.xhp
msgctxt ""
@@ -24149,7 +24165,7 @@ msgctxt ""
"04060110.xhp\n"
"par_id3156074\n"
"help.text"
-msgid "<item type=\"input\">=TRIM(\" hello world \")</item> returns hello world without leading and trailing spaces and with single space between words."
+msgid "<item type=\"input\">=TRIM(\" hello world \")</item> returns hello world without leading and trailing spaces and with single space between words."
msgstr ""
#: 04060110.xhp
@@ -26957,7 +26973,7 @@ msgctxt ""
"04060115.xhp\n"
"par_id050220171019078280\n"
"help.text"
-msgid "=BESSELJ(3.45, 4.333), returns 0.144803466373734, same as above because the fractional part of N is ignored."
+msgid "=BESSELJ(3.45, 4.333), returns 0.196772639864984, same as above because the fractional part of N is ignored."
msgstr ""
#: 04060115.xhp
@@ -30677,8 +30693,8 @@ msgctxt ""
"04060118.xhp\n"
"par_id3149025\n"
"help.text"
-msgid "VDB(Cost; Salvage; Life; S; End; Factor; Type)"
-msgstr "VDB(成本; 残值; 折旧期限; 开始期间; 结束期间; 系数; 类型)"
+msgid "VDB(Cost; Salvage; Life; S; End; Factor; NoSwitch)"
+msgstr ""
#: 04060118.xhp
msgctxt ""
@@ -30733,8 +30749,8 @@ msgctxt ""
"04060118.xhp\n"
"par_id3154865\n"
"help.text"
-msgid "<emph>Type </emph>is an optional parameter. Type = 1 means a switch to linear depreciation. In Type = 0 no switch is made."
-msgstr "<emph>类型</emph> 是可选参数。类型=1 表示转换为线性折旧。类型=0 表示不转换。"
+msgid "<emph>NoSwitch</emph>is an optional parameter. NoSwitch = 0 (default) means a switch to linear depreciation. In NoSwitch = 1 no switch is made."
+msgstr ""
#: 04060118.xhp
msgctxt ""
@@ -48845,16 +48861,16 @@ msgctxt ""
"05070500.xhp\n"
"par_idN109BF\n"
"help.text"
-msgid "You may clear one of the boxes, then the unspecified dimension will use as many pages as necessary."
-msgstr "可以清除其中一个框中的值,对于未指定的值,则在打印时根据需要打印尽可能多的页数。"
+msgid "You may disable one of the boxes, then the unspecified dimension will use as many pages as necessary."
+msgstr ""
#: 05070500.xhp
msgctxt ""
"05070500.xhp\n"
"par_idN109C3\n"
"help.text"
-msgid "If you clear both boxes, this will result in a scaling factor of 100%."
-msgstr "如果清除这两个框中的值,则表示缩放因子为 100%。"
+msgid "If you disable both boxes, this will result in a scaling factor of 100%."
+msgstr ""
#: 05070500.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 4c2612253ad..6851fccb312 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-10-04 11:48+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\n"
"PO-Revision-Date: 2017-02-17 01:00+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4749,8 +4749,8 @@ msgctxt ""
"three_d_view.xhp\n"
"par_id9038972\n"
"help.text"
-msgid "Set the light sources for the 3D view."
-msgstr "为三维视图设置光源。"
+msgid "<ahelp hid=\".\">Set the light sources for the 3D view.</ahelp>"
+msgstr ""
#: three_d_view.xhp
msgctxt ""
@@ -7091,30 +7091,6 @@ msgstr "网格"
#: wiz_chart_elements.xhp
msgctxt ""
"wiz_chart_elements.xhp\n"
-"par_id6737876\n"
-"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Displays grid lines that are perpendicular to the x-axis.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">显示与 x 轴垂直的网格线。</ahelp>"
-
-#: wiz_chart_elements.xhp
-msgctxt ""
-"wiz_chart_elements.xhp\n"
-"par_id1058992\n"
-"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Displays grid lines that are perpendicular to the y-axis.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">显示与 y 轴垂直的网格线。</ahelp>"
-
-#: wiz_chart_elements.xhp
-msgctxt ""
-"wiz_chart_elements.xhp\n"
-"par_id7366557\n"
-"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Displays grid lines that are perpendicular to the z-axis. This option is only available for three-dimensional charts.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">显示与 z 轴垂直的网格线。此选项只对三维图表可用。</ahelp>"
-
-#: wiz_chart_elements.xhp
-msgctxt ""
-"wiz_chart_elements.xhp\n"
"par_id6527298\n"
"help.text"
msgid "The visible grid lines can help to estimate the data values in the chart."
diff --git a/source/zh-CN/helpcontent2/source/text/shared.po b/source/zh-CN/helpcontent2/source/text/shared.po
index 13053dc8f79..cdd3a0cd7c2 100644
--- a/source/zh-CN/helpcontent2/source/text/shared.po
+++ b/source/zh-CN/helpcontent2/source/text/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-10-04 11:48+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\n"
"PO-Revision-Date: 2017-01-20 02:13+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -293,8 +293,8 @@ msgctxt ""
"fontwork_toolbar.xhp\n"
"par_idN10571\n"
"help.text"
-msgid "<ahelp hid=\".\">Opens the Fontwork Gallery where you can select another preview. Click OK to apply the new set of properties to your Fontwork object.</ahelp>"
-msgstr "<ahelp hid=\".\">打开“艺术字图片库”,您可以在其中选择其他预览。单击“确定”可将新的属性集应用到您的“艺术字”对象。</ahelp>"
+msgid "Opens the Fontwork Gallery where you can select another preview. Click OK to apply the new set of properties to your Fontwork object."
+msgstr ""
#: fontwork_toolbar.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/shared/00.po b/source/zh-CN/helpcontent2/source/text/shared/00.po
index 11d513d4397..45bce04f54a 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/00.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/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-10-04 11:48+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\n"
"PO-Revision-Date: 2017-03-20 12:29+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6517,32 +6517,32 @@ msgctxt ""
"00000402.xhp\n"
"par_id3153336\n"
"help.text"
-msgid "<variable id=\"aufzeichnen\">Choose <emph>Edit - Track Changes - Record Changes</emph></variable>"
-msgstr "<variable id=\"aufzeichnen\">选择<emph>编辑 - 修订记录 - 记录更改</emph></variable>"
+msgid "<variable id=\"aufzeichnen\">Choose <emph>Edit - Track Changes - Record</emph></variable>"
+msgstr ""
#: 00000402.xhp
msgctxt ""
"00000402.xhp\n"
"par_id3150594\n"
"help.text"
-msgid "<variable id=\"anzeigen\"><switchinline select=\"appl\"><caseinline select=\"WRITER\">Choose <emph>Edit - Track Changes - Show Changes</emph></caseinline><caseinline select=\"CALC\">Choose <emph>Edit - Track Changes - Show Changes</emph></caseinline></switchinline></variable>"
-msgstr "<variable id=\"anzeigen\"><switchinline select=\"appl\"><caseinline select=\"WRITER\">选择<emph>编辑 - 修订记录 - 显示更改</emph></caseinline><caseinline select=\"CALC\">选择<emph>编辑 - 修订记录 - 显示更改</emph></caseinline></switchinline></variable>"
+msgid "<variable id=\"anzeigen\"><switchinline select=\"appl\"><caseinline select=\"WRITER\">Choose <emph>Edit - Track Changes - Show</emph></caseinline><caseinline select=\"CALC\">Choose <emph>Edit - Track Changes - Show</emph></caseinline></switchinline></variable>"
+msgstr ""
#: 00000402.xhp
msgctxt ""
"00000402.xhp\n"
"par_id3153845\n"
"help.text"
-msgid "<variable id=\"rotlinie\">Choose <emph>Edit - Track Changes - Manage Changes</emph></variable>"
-msgstr "<variable id=\"rotlinie\">选择<emph>编辑 - 修订记录 - 管理更改</emph></variable>"
+msgid "<variable id=\"rotlinie\">Choose <emph>Edit - Track Changes - Manage</emph></variable>"
+msgstr ""
#: 00000402.xhp
msgctxt ""
"00000402.xhp\n"
"par_id3148587\n"
"help.text"
-msgid "Choose <emph>Edit - Track Changes - Manage Changes - List</emph> tab"
-msgstr "选择<emph>编辑 - 修订记录 - 管理更改 - 列表</emph>选项卡"
+msgid "Choose <emph>Edit - Track Changes - Manage - List</emph> tab"
+msgstr ""
#: 00000402.xhp
msgctxt ""
@@ -6557,8 +6557,8 @@ msgctxt ""
"00000402.xhp\n"
"par_id3153878\n"
"help.text"
-msgid "<variable id=\"rotliniefilter\">Choose <emph>Edit - Track Changes - Manage Changes - Filter</emph> tab </variable>"
-msgstr "<variable id=\"rotliniefilter\">选择<emph>编辑 - 修订记录 - 管理更改 - 筛选</emph>选项卡</variable>"
+msgid "<variable id=\"rotliniefilter\">Choose <emph>Edit - Track Changes - Manage - Filter</emph> tab</variable>"
+msgstr ""
#: 00000402.xhp
msgctxt ""
@@ -6581,16 +6581,16 @@ msgctxt ""
"00000402.xhp\n"
"par_id3148773\n"
"help.text"
-msgid "Choose <emph>Edit - Track Changes - Comment on Change</emph>"
-msgstr "选择<emph>编辑 - 修订记录 - 为更改添加注释</emph>"
+msgid "Choose <emph>Edit - Track Changes - Comment</emph>"
+msgstr ""
#: 00000402.xhp
msgctxt ""
"00000402.xhp\n"
"par_id3149488\n"
"help.text"
-msgid "Choose <emph>Edit - Track Changes - Manage Changes - List</emph> tab. Click an entry in the list and open the context menu. Choose <emph>Edit Comment</emph>"
-msgstr "选择<emph>编辑 - 修订记录 - 管理更改 - 列表</emph>选项卡。单击该列表中的一个项目,在右键菜单中选择<emph>编辑注释</emph>"
+msgid "Choose <emph>Edit - Track Changes - Manage - List</emph> tab. Click an entry in the list and open the context menu. Choose <emph>Edit Comment</emph>"
+msgstr ""
#: 00000402.xhp
msgctxt ""
@@ -7149,8 +7149,16 @@ msgctxt ""
"00000404.xhp\n"
"par_idN107CD\n"
"help.text"
-msgid "<variable id=\"moviesound\">Choose <emph>Insert - Media - Audio or Video</emph></variable>"
-msgstr "<variable id=\"moviesound\">选择 <emph>插入 - 媒体 - 音频或视频</emph></variable>"
+msgid "<variable id=\"moviesound\">Choose <emph>Insert - Media - Audio or Video</emph>.</variable>"
+msgstr ""
+
+#: 00000404.xhp
+msgctxt ""
+"00000404.xhp\n"
+"par_idN107CE\n"
+"help.text"
+msgid "<variable id=\"moviesound2\">Choose <emph>Insert - Audio or Video</emph></variable>"
+msgstr ""
#: 00000404.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/shared/01.po b/source/zh-CN/helpcontent2/source/text/shared/01.po
index eecc5617188..58f1b5d6067 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-10-04 11:48+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\n"
"PO-Revision-Date: 2017-09-05 06:12+0000\n"
"Last-Translator: Voina i Mir <shanshandehongxing@outlook.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1717,8 +1717,8 @@ msgctxt ""
"01020000.xhp\n"
"par_id3151191\n"
"help.text"
-msgid "<variable id=\"oeffnentext\"><ahelp hid=\"fpicker/ui/explorerfiledialog/ExplorerFileDialog\">Opens, opens a remote file or imports a file.</ahelp> </variable>"
-msgstr "<variable id=\"oeffnentext\"><ahelp hid=\"fpicker/ui/explorerfiledialog/ExplorerFileDialog\">打开文件,打开远程文件或者导入文件。</ahelp> </variable>"
+msgid "<variable id=\"oeffnentext\"><ahelp hid=\".\">Opens a local or remote file, or imports one.</ahelp></variable>"
+msgstr ""
#: 01020000.xhp
msgctxt ""
@@ -2349,8 +2349,8 @@ msgctxt ""
"01070000.xhp\n"
"par_id3146856\n"
"help.text"
-msgid "<variable id=\"speichernuntertext\"><ahelp hid=\"HID_FILESAVE_DIALOG\">Saves the current document in a different location, or with a different file name or file type.</ahelp></variable>"
-msgstr "<variable id=\"speichernuntertext\"><ahelp hid=\"HID_FILESAVE_DIALOG\">将当前文档保存到其他位置,或者以不同的文件名或文件类型保存当前文档。</ahelp></variable>"
+msgid "<variable id=\"speichernuntertext\"><ahelp hid=\".\">Saves the current document in a different location, or with a different file name or file type.</ahelp></variable>"
+msgstr ""
#: 01070000.xhp
msgctxt ""
@@ -3373,8 +3373,8 @@ msgctxt ""
"01100600.xhp\n"
"par_idN106B8\n"
"help.text"
-msgid "<ahelp hid=\".\">Select to enable recording changes. This is the same as <emph>Edit - Track Changes - Record Changes</emph>.</ahelp>"
-msgstr "<ahelp hid=\".\">选择以启用修订记录模式。这与<emph>编辑 - 追踪修订</emph>的作用相同。</ahelp>"
+msgid "<ahelp hid=\".\">Select to enable recording changes. This is the same as <emph>Edit - Track Changes - Record</emph>.</ahelp>"
+msgstr ""
#: 01100600.xhp
msgctxt ""
@@ -5157,8 +5157,8 @@ msgctxt ""
"02010000.xhp\n"
"par_id3149205\n"
"help.text"
-msgid "<ahelp hid=\"svx/ui/imapdialog/TBI_UNDO\">Reverses the last command or the last entry you typed. To select the command that you want to reverse, click the arrow next to the <emph>Undo </emph>icon on the Standard bar.</ahelp>"
-msgstr "<ahelp hid=\"svx/ui/imapdialog/TBI_UNDO\">撤消键入的最后一个命令或最后一个条目。要选择想撤消的命令,请单击“标准”栏上<emph>撤消</emph>图标旁边的箭头。</ahelp>"
+msgid "<ahelp hid=\".\">Reverses the last command or the last entry you typed. To select the command that you want to reverse, click the arrow next to the <emph>Undo </emph>icon on the Standard bar.</ahelp>"
+msgstr ""
#: 02010000.xhp
msgctxt ""
@@ -5253,8 +5253,8 @@ msgctxt ""
"02020000.xhp\n"
"par_id3157898\n"
"help.text"
-msgid "<ahelp hid=\"svx/ui/imapdialog/TBI_REDO\">Reverses the action of the last <emph>Undo</emph> command. To select the <emph>Undo</emph> step that you want to reverse, click the arrow next to the <emph>Redo</emph> icon on the Standard bar.</ahelp>"
-msgstr "<ahelp hid=\"svx/ui/imapdialog/TBI_REDO\">恢复上一个由<emph>撤消</emph>命令撤消的操作。要选择想撤消的<emph>撤消</emph>步骤,请单击标准栏上<emph>恢复</emph>图标旁边的箭头。</ahelp>"
+msgid "<ahelp hid=\".\">Reverses the action of the last <emph>Undo</emph> command. To select the <emph>Undo</emph> step that you want to reverse, click the arrow next to the <emph>Redo</emph> icon on the Standard bar.</ahelp>"
+msgstr ""
#: 02030000.xhp
msgctxt ""
@@ -9981,16 +9981,16 @@ msgctxt ""
"02230000.xhp\n"
"hd_id3153527\n"
"help.text"
-msgid "<link href=\"text/shared/01/02230400.xhp\" name=\"Manage Changes\">Manage Changes</link>"
-msgstr "<link href=\"text/shared/01/02230000.xhp\" name=\"管理更改\">管理更改</link>"
+msgid "<link href=\"text/shared/01/02230400.xhp\" name=\"Manage\">Manage</link>"
+msgstr ""
#: 02230000.xhp
msgctxt ""
"02230000.xhp\n"
"hd_id3145072\n"
"help.text"
-msgid "<link href=\"text/shared/01/02230300.xhp\" name=\"Comment on Change\">Comment on Change</link>"
-msgstr "<link href=\"text/shared/01/02230300.xhp\" name=\"为更改添加注释\">为更改添加注释</link>"
+msgid "<link href=\"text/shared/01/02230300.xhp\" name=\"Comment\">Comment</link>"
+msgstr ""
#: 02230100.xhp
msgctxt ""
@@ -10013,15 +10013,15 @@ msgctxt ""
"02230100.xhp\n"
"par_id3155599\n"
"help.text"
-msgid "<ahelp hid=\".uno:TraceChangeMode\">Tracks each change that is made in the current document by author and date. </ahelp>"
-msgstr "<ahelp hid=\".uno:TraceChangeMode\">跟踪当前文档中每处修改的作者和日期。</ahelp>"
+msgid "<ahelp hid=\".\">Tracks each change that is made in the current document by author and date. </ahelp>"
+msgstr ""
#: 02230100.xhp
msgctxt ""
"02230100.xhp\n"
"par_id3155934\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">If you choose <emph>Edit - Track Changes - Show Changes</emph>, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing <link href=\"text/shared/optionen/01040700.xhp\" name=\"Writer - Changes\"><emph>%PRODUCTNAME Writer - Changes</emph></link> in the Options dialog box.</caseinline></switchinline>"
+msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">If you choose <emph>Edit - Track Changes - Show</emph>, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing <link href=\"text/shared/optionen/01040700.xhp\" name=\"Writer - Changes\"><emph>%PRODUCTNAME Writer - Changes</emph></link> in the Options dialog box.</caseinline></switchinline>"
msgstr ""
#: 02230100.xhp
@@ -10213,8 +10213,8 @@ msgctxt ""
"02230200.xhp\n"
"par_id3153323\n"
"help.text"
-msgid "<variable id=\"text\"><ahelp hid=\".uno:ShowChanges\">Shows or hides recorded changes.</ahelp></variable>"
-msgstr "<variable id=\"text\"><ahelp hid=\".uno:ShowChanges\">显示或隐藏已经记录的更改。</ahelp></variable>"
+msgid "<variable id=\"text\"><ahelp hid=\".\">Shows or hides recorded changes.</ahelp></variable>"
+msgstr ""
#: 02230200.xhp
msgctxt ""
@@ -10309,8 +10309,8 @@ msgctxt ""
"02230300.xhp\n"
"par_id3148983\n"
"help.text"
-msgid "<variable id=\"kommentartext\"><ahelp hid=\"cui/ui/comment/edit\">Enter a comment for the recorded change.</ahelp></variable>"
-msgstr "<variable id=\"kommentartext\"><ahelp hid=\"cui/ui/comment/edit\">为已经记录的更改输入注释。</ahelp></variable>"
+msgid "<variable id=\"kommentartext\"><ahelp hid=\".\">Enter a comment for the recorded change.</ahelp></variable>"
+msgstr ""
#: 02230300.xhp
msgctxt ""
@@ -10349,8 +10349,8 @@ msgctxt ""
"02230400.xhp\n"
"par_id3147240\n"
"help.text"
-msgid "<variable id=\"redlining\"><ahelp hid=\".uno:AcceptChanges\" visibility=\"visible\">Accept or reject recorded changes.</ahelp></variable>"
-msgstr "<variable id=\"redlining\"><ahelp hid=\".uno:AcceptChanges\" visibility=\"visible\">接受或拒绝已记录的更改。</ahelp></variable>"
+msgid "<variable id=\"redlining\"><ahelp hid=\".\">Accept or reject recorded changes.</ahelp></variable>"
+msgstr ""
#: 02230401.xhp
msgctxt ""
@@ -10613,8 +10613,8 @@ msgctxt ""
"02230401.xhp\n"
"par_id3152935\n"
"help.text"
-msgid "<ahelp hid=\"svx/ui/acceptrejectchangesdialog/accept\">Accepts the selected change and removes the highlighting from the change in the document.</ahelp>"
-msgstr "<ahelp hid=\"svx/ui/acceptrejectchangesdialog/accept\">接受选定的更改,并取消文档中的高亮显示。</ahelp>"
+msgid "<ahelp hid=\".\">Accepts the selected change and removes the highlighting from the change in the document.</ahelp>"
+msgstr ""
#: 02230401.xhp
msgctxt ""
@@ -10629,8 +10629,8 @@ msgctxt ""
"02230401.xhp\n"
"par_id3150441\n"
"help.text"
-msgid "<ahelp hid=\"svx/ui/acceptrejectchangesdialog/reject\">Rejects the selected change and removes the highlighting from the change in the document.</ahelp>"
-msgstr "<ahelp hid=\"svx/ui/acceptrejectchangesdialog/reject\">拒绝选定的更改,并取消其在文档中的高亮显示。</ahelp>"
+msgid "<ahelp hid=\".\">Rejects the selected change and removes the highlighting from the change in the document.</ahelp>"
+msgstr ""
#: 02230401.xhp
msgctxt ""
@@ -12917,8 +12917,8 @@ msgctxt ""
"05010000.xhp\n"
"par_id3145829\n"
"help.text"
-msgid "<ahelp hid=\".uno:StandardTextAttributes\">Removes direct formatting and formatting by character styles from the selection.</ahelp>"
-msgstr "<ahelp hid=\".uno:StandardTextAttributes\">从所选内容中删除直接格式和字符样式的格式。</ahelp>"
+msgid "<ahelp hid=\".\">Removes direct formatting and formatting by character styles from the selection.</ahelp>"
+msgstr ""
#: 05010000.xhp
msgctxt ""
@@ -13277,8 +13277,8 @@ msgctxt ""
"05020200.xhp\n"
"par_id3144766\n"
"help.text"
-msgid "<ahelp hid=\".uno:FontColor\" visibility=\"hidden\"><variable id=\"textfarbe\">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the Font color toolbar.</variable></ahelp>"
-msgstr "<ahelp hid=\".uno:FontColor\" visibility=\"hidden\"><variable id=\"textfarbe\">单击为所选字符应用当前字体颜色。您也可以单击此处,然后拖动一定区域来更改文本颜色。单击图标旁的箭头可打开“字体颜色”工具栏。</variable></ahelp>"
+msgid "<ahelp hid=\".\" visibility=\"hidden\"><variable id=\"textfarbe\">Click to apply the current font color to the selected characters. You can also click here, and then drag a selection to change the text color. Click the arrow next to the icon to open the Font color toolbar.</variable></ahelp>"
+msgstr ""
#: 05020200.xhp
msgctxt ""
@@ -13437,8 +13437,8 @@ msgctxt ""
"05020200.xhp\n"
"par_idN10B85\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/effectspage/hiddencb\">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also 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> and select <emph>Hidden text</emph>."
-msgstr "<ahelp hid=\"cui/ui/effectspage/hiddencb\">隐藏选定的字符。</ahelp>要显示隐藏的文本,请确保在<emph>视图</emph>菜单中选择了<emph>非打印字符</emph>。您也可以选择 <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - 偏好设置</emph></caseinline><defaultinline><emph>工具 - 选项</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - 格式化辅助</emph>,然后选择<emph>隐藏的文本</emph>。"
+msgid "<ahelp hid=\"cui/ui/effectspage/hiddencb\">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Formatting Marks</emph> is selected in the <emph>View</emph> menu. You can also 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> and select <emph>Hidden text</emph>."
+msgstr ""
#: 05020200.xhp
msgctxt ""
@@ -14629,7 +14629,7 @@ msgctxt ""
"05020301.xhp\n"
"par_id3147534\n"
"help.text"
-msgid "Era on the Japanese Gengou calendar, single character (possible values are: M, T, S, H)"
+msgid "Era, abbreviation. On the Japanese Gengou calendar, single character (possible values are: M, T, S, H)"
msgstr ""
#: 05020301.xhp
@@ -14653,7 +14653,7 @@ msgctxt ""
"05020301.xhp\n"
"par_id3147344\n"
"help.text"
-msgid "Number of the year within an era, without a leading zero for single-digit years"
+msgid "Number of the year within an era, short format"
msgstr ""
#: 05020301.xhp
@@ -14661,7 +14661,7 @@ msgctxt ""
"05020301.xhp\n"
"par_id3148487\n"
"help.text"
-msgid "Number of the year within an era, with a leading zero for single-digit years"
+msgid "Number of the year within an era, long format"
msgstr ""
#: 05020301.xhp
@@ -17573,8 +17573,8 @@ msgctxt ""
"05020500.xhp\n"
"par_id3146974\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/positionpage/kerningsb\">Specifies the spacing between the characters of the selected text. Enter the amount by which you want to expand or condense the text in the spin button.</ahelp>"
-msgstr "<ahelp hid=\"cui/ui/positionpage/kerninglb\">指定选定文字中各个字符之间的间距。要拉伸或压缩间距,请在<emph>按照</emph>框中输入文字被拉伸或压缩的值。</ahelp>"
+msgid "<ahelp hid=\".\">Specifies the spacing between the characters of the selected text.</ahelp> Enter the amount by which you want to expand or condense the text in the spin button."
+msgstr ""
#: 05020500.xhp
msgctxt ""
@@ -17845,8 +17845,8 @@ msgctxt ""
"05030000.xhp\n"
"par_id3148668\n"
"help.text"
-msgid "<variable id=\"absatztext\"><ahelp hid=\".uno:EditStyle\">Modifies the format of the current paragraph, such as indents and alignment.</ahelp></variable> To modify the font of the current paragraph, select the entire paragraph, choose Format - Character, and then click on the Font tab."
-msgstr "<variable id=\"absatztext\"><ahelp hid=\".uno:EditStyle\">修改当前段落的格式,例如缩进和对齐。</ahelp></variable>要修改当前段落的字体,请选择整个段落,然后选择“格式”-“字符”并单击“字体”选项卡。"
+msgid "<variable id=\"absatztext\"><ahelp hid=\".\">Modifies the format of the current paragraph, such as indents and alignment.</ahelp></variable> To modify the font of the current paragraph, select the entire paragraph, choose Format - Character, and then click on the Font tab."
+msgstr ""
#: 05030000.xhp
msgctxt ""
@@ -22253,8 +22253,8 @@ msgctxt ""
"05120000.xhp\n"
"par_id3153514\n"
"help.text"
-msgid "Specify the amount of space to leave between lines of text in a paragraph."
-msgstr "指定段落中文字的行距。"
+msgid "<ahelp hid=\".\">Specify the amount of space to leave between lines of text in a paragraph.</ahelp>"
+msgstr ""
#: 05120000.xhp
msgctxt ""
@@ -29765,8 +29765,8 @@ msgctxt ""
"06010000.xhp\n"
"par_id3154682\n"
"help.text"
-msgid "<variable id=\"recht\"><ahelp hid=\".uno:Spelling\">Checks the document or the current selection for spelling errors. If a grammar checking extension is installed, the dialog also checks for grammar errors.</ahelp></variable>"
-msgstr "<variable id=\"recht\"><ahelp hid=\".uno:Spelling\">检查文档或当前选定文本中的拼写错误。如果安装了语法检查扩展,该对话框也会检查语法错误。</ahelp></variable>"
+msgid "<variable id=\"recht\"><ahelp hid=\".\">Checks the document or the current selection for spelling errors. If a grammar checking extension is installed, the dialog also checks for grammar errors.</ahelp></variable>"
+msgstr ""
#: 06010000.xhp
msgctxt ""
@@ -30829,8 +30829,8 @@ msgctxt ""
"06040000.xhp\n"
"par_id3153394\n"
"help.text"
-msgid "To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose <emph>Tools - Cell Contents - AutoInput</emph>, and in $[officename] Writer choose <emph>Format - AutoCorrect - While Typing</emph>. To apply the AutoCorrect settings to an entire text document, choose <emph>Format - AutoCorrect - Apply</emph>."
-msgstr "要打开或关闭“自动更正”功能,请在 $[officename] Calc 中选择<emph>工具 - 单元格内容 - 自动输入</emph>,在 $[officename] Writer 中选择<emph>格式 - 自动更正 - 在键入时</emph>。要将自动更正设置应用到整篇文档,请选择<emph>格式 - 自动更正 - 应用</emph>。"
+msgid "To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose <emph>Tools - AutoInput</emph>, and in $[officename] Writer choose <emph>Format - AutoCorrect - While Typing</emph>. To apply the AutoCorrect settings to an entire text document, choose <emph>Format - AutoCorrect - Apply</emph>."
+msgstr ""
#: 06040000.xhp
msgctxt ""
@@ -32341,8 +32341,8 @@ msgctxt ""
"06050000.xhp\n"
"par_id3150146\n"
"help.text"
-msgid "<variable id=\"numauftext\"><ahelp hid=\".uno:BulletsAndNumberingDial\">Adds numbering or bullets to the current paragraph, and lets you edit format of the numbering or bullets.</ahelp></variable>"
-msgstr "<variable id=\"numauftext\"><ahelp hid=\".uno:BulletsAndNumberingDial\">为当前段落添加编号或项目符号,并允许您编辑编号或项目符号的格式。</ahelp></variable>"
+msgid "<variable id=\"numauftext\"><ahelp hid=\".\">Adds numbering or bullets to the current paragraph, and lets you edit format of the numbering or bullets.</ahelp></variable>"
+msgstr ""
#: 06050000.xhp
msgctxt ""
@@ -38717,8 +38717,8 @@ msgctxt ""
"moviesound.xhp\n"
"par_idN1068E\n"
"help.text"
-msgid "Choose <emph>Insert - Media - Audio or Video</emph>."
-msgstr "选择 <emph>插入 - 媒体 - 音视频</emph>。"
+msgid "Choose <emph>Insert - Media - Audio or Video</emph>. For %PRODUCTNAME Impress, choose <emph>Insert - Audio or video</emph>."
+msgstr ""
#: moviesound.xhp
msgctxt ""
@@ -38816,6 +38816,78 @@ msgctxt ""
msgid "You can also use the Media Playback Bar to pause, to stop, to loop, as well as to adjust the volume or to mute the playback of the file. The current playback position in the file is indicated on the left slider. Use the right slider to adjust the playback volume. For movie files, the bar also contains a list box where you can select the zoom factor for the playback."
msgstr "您可以使用“媒体播放栏”暂停、停止、循环播放播放的文件以及调整音量或静音。滑块的左侧显示文件的当前播放位置。请使用右侧滑块调整播放的音量。对于影片文件,该栏中还包含一个列表框,您可以在其中选择播放的显示比例。"
+#: moviesound.xhp
+msgctxt ""
+"moviesound.xhp\n"
+"hd_id281511208172156\n"
+"help.text"
+msgid "Supported media formats"
+msgstr ""
+
+#: moviesound.xhp
+msgctxt ""
+"moviesound.xhp\n"
+"par_id971511208248862\n"
+"help.text"
+msgid "%PRODUCTNAME relies on the operating system's installed media support."
+msgstr ""
+
+#: moviesound.xhp
+msgctxt ""
+"moviesound.xhp\n"
+"par_id231511209745892\n"
+"help.text"
+msgid "<emph>For Microsoft Windows</emph>: %PRODUCTNAME can open anything for which <emph>DirectShow</emph> filters are installed (<link href=\"http://msdn.microsoft.com/en-us/library/ms787745%28VS.85%29.aspx\" name=\"linkname\">list of default formats</link>)."
+msgstr ""
+
+#: moviesound.xhp
+msgctxt ""
+"moviesound.xhp\n"
+"par_id601511209768414\n"
+"help.text"
+msgid "<emph>For GNU/Linux</emph>: %PRODUCTNAME uses <emph>gstreamer</emph>, so whatever you can play using gstreamer can be used with %PRODUCTNAME (<link href=\"http://gstreamer.freedesktop.org/data/doc/gstreamer/head/pwg/html/section-types-definitions.html\" name=\"linkname\">list of defined types</link>)."
+msgstr ""
+
+#: moviesound.xhp
+msgctxt ""
+"moviesound.xhp\n"
+"par_id841511209784505\n"
+"help.text"
+msgid "<emph>For Apple macOS</emph>: %PRODUCTNAME uses <emph>QuickTime</emph> supported media formats (<link href=\"https://documentation.apple.com/en/finalcutpro/usermanual/index.html#chapter=103%26section=4%26tasks=true\" name=\"linkname\">list of media formats</link>)."
+msgstr ""
+
+#: moviesound.xhp
+msgctxt ""
+"moviesound.xhp\n"
+"par_id391511209364018\n"
+"help.text"
+msgid "<link href=\"http://msdn.microsoft.com/en-us/library/ms787745%28VS.85%29.aspx\" name=\"linkname\">List of default formats for Microsoft Windows DirectShow </link>."
+msgstr ""
+
+#: moviesound.xhp
+msgctxt ""
+"moviesound.xhp\n"
+"par_id921511209448360\n"
+"help.text"
+msgid "<link href=\"http://gstreamer.freedesktop.org/data/doc/gstreamer/head/pwg/html/section-types-definitions.html\" name=\"linkname\">List of defined types for gstreamer in GNU/Linux </link>."
+msgstr ""
+
+#: moviesound.xhp
+msgctxt ""
+"moviesound.xhp\n"
+"par_id591511209548848\n"
+"help.text"
+msgid "<link href=\"https://documentation.apple.com/en/finalcutpro/usermanual/index.html#chapter=103%26section=4%26tasks=true\" name=\"linkname\">List of media formats for Apple macOS QuickTime</link>."
+msgstr ""
+
+#: moviesound.xhp
+msgctxt ""
+"moviesound.xhp\n"
+"par_id561511210645479\n"
+"help.text"
+msgid "<link href=\"https://ask.libreoffice.org/en/question/854/what-video-formats-does-libreoffice-impress-support/\" name=\"linkname\">%PRODUCTNAME Askbot question and answer</link>"
+msgstr ""
+
#: notebook_bar.xhp
msgctxt ""
"notebook_bar.xhp\n"
diff --git a/source/zh-CN/helpcontent2/source/text/shared/02.po b/source/zh-CN/helpcontent2/source/text/shared/02.po
index b8600caa603..5a93c5a5c6d 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/02.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/02.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-10-04 11:48+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\n"
"PO-Revision-Date: 2016-05-25 06:28+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -9509,8 +9509,8 @@ msgctxt ""
"02010000.xhp\n"
"par_id3155351\n"
"help.text"
-msgid "<ahelp hid=\".uno:StyleApply\">Assigns a style to the current paragraph, selected paragraphs, or to a selected object.</ahelp>"
-msgstr "<ahelp hid=\".uno:StyleApply\">用于为当前段落、选定段落或选定对象指定样式。</ahelp>"
+msgid "<ahelp hid=\".\">Assigns a style to the current paragraph, selected paragraphs, or to a selected object.</ahelp>"
+msgstr ""
#: 02010000.xhp
msgctxt ""
@@ -11277,8 +11277,8 @@ msgctxt ""
"09070000.xhp\n"
"par_id3156183\n"
"help.text"
-msgid "<variable id=\"hyperdiatext\"><ahelp hid=\".uno:EditHyperlink\">Opens a dialog that enables you to create and edit hyperlinks.</ahelp></variable>"
-msgstr "<variable id=\"hyperdiatext\"><ahelp hid=\".uno:EditHyperlink\">打开用于创建和编辑超链接的对话框。</ahelp></variable>"
+msgid "<variable id=\"hyperdiatext\"><ahelp hid=\".\">Opens a dialog that enables you to create and edit hyperlinks.</ahelp></variable>"
+msgstr ""
#: 09070000.xhp
msgctxt ""
@@ -17173,8 +17173,8 @@ msgctxt ""
"fontwork.xhp\n"
"par_idN10595\n"
"help.text"
-msgid "<ahelp hid=\".\">The Fontwork Gallery displays previews of Fontwork objects. To insert an object into your document, select the object, and then click OK.</ahelp>"
-msgstr "<ahelp hid=\".\">“艺术字图片库”可以显示艺术字对象的预览。要在文档中插入一个对象,请选择对象,然后单击“确定”。</ahelp>"
+msgid "The Fontwork Gallery displays previews of Fontwork objects. To insert an object into your document, select the object, and then click OK."
+msgstr ""
#: fontwork.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/shared/05.po b/source/zh-CN/helpcontent2/source/text/shared/05.po
index 4aae5fe4648..52a1ea49ec2 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/05.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/05.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-30 09:54+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\n"
"PO-Revision-Date: 2016-05-02 14:22+0000\n"
"Last-Translator: 琨珑 锁 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,8 +69,8 @@ msgctxt ""
"00000001.xhp\n"
"par_id1318380\n"
"help.text"
-msgid "The %PRODUCTNAME localization projects offer support pages in local languages. Find an overview of the native language projects at <link href=\"http://www.libreoffice.org/international-sites/\">http://www.libreoffice.org/international-sites/</link>. You can find help and support in English language on the %PRODUCTNAME website at <link href=\"http://www.libreoffice.org/get-help/\">www.libreoffice.org</link>."
-msgstr "%PRODUCTNAME 本地化项目提供本地语言的支持页面。请在 <link href=\"http://www.libreoffice.org/international-sites/\">http://www.libreoffice.org/international-sites/</link> 查看母语项目概览。您可以在 %PRODUCTNAME 网站 <link href=\"http://www.libreoffice.org/get-help/\">www.libreoffice.org</link> 找到英语的帮助与支持。"
+msgid "The %PRODUCTNAME localization projects offer support pages in local languages. Find an overview of the native language projects at <link href=\"https://www.libreoffice.org/community/nlc/\">www.libreoffice.org/community/nlc/</link>. You can find help and support in English language on the %PRODUCTNAME website at <link href=\"https://www.libreoffice.org/get-help/\">www.libreoffice.org</link>."
+msgstr ""
#: 00000001.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/shared/autopi.po b/source/zh-CN/helpcontent2/source/text/shared/autopi.po
index 9aa936c0f2c..f91f632c229 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/autopi.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/autopi.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-11-22 13:53+0100\n"
"PO-Revision-Date: 2016-05-25 06:29+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2429,8 +2429,8 @@ msgctxt ""
"01090100.xhp\n"
"par_id3150445\n"
"help.text"
-msgid "<ahelp hid=\".\">On this page of the <link href=\"text/shared/autopi/01090000.xhp\">Form Wizard</link>, you can specify the table or query that you need to create the form as well as the fields that you want to include in the form.</ahelp>"
-msgstr "<ahelp hid=\".\">在本<link href=\"text/shared/autopi/01090000.xhp\">窗体向导</link>页面中,您可以指定创建窗体所需的表格或查询,以及要包含在窗体中的字段。</ahelp>"
+msgid "On this page of the <link href=\"text/shared/autopi/01090000.xhp\">Form Wizard</link>, you can specify the table or query that you need to create the form as well as the fields that you want to include in the form."
+msgstr ""
#: 01090100.xhp
msgctxt ""
@@ -2445,8 +2445,8 @@ msgctxt ""
"01090100.xhp\n"
"par_id3147399\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGFORM_LBTABLES\">Specifies the table or query that you want to create the form for.</ahelp>"
-msgstr "<ahelp hid=\"HID_DLGFORM_LBTABLES\" visibility=\"visible\">指定用于创建表格的表格或查询。</ahelp>"
+msgid "<ahelp hid=\".\">Specifies the table or query that you want to create the form for.</ahelp>"
+msgstr ""
#: 01090100.xhp
msgctxt ""
@@ -2461,8 +2461,8 @@ msgctxt ""
"01090100.xhp\n"
"par_id3149095\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGFORM_FIELDSAVAILABLE\">Lists the names of the data base fields in the selected table or query.</ahelp> Click to select a field or hold down the Shift or the <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while you click to select more than one field."
-msgstr "<ahelp hid=\"HID_DLGFORM_FIELDSAVAILABLE\">列出选定表格或查询中数据库字段的名称。</ahelp>单击以选择字段,或者在单击时按 Shift 或 <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> 键以选择多个字段。"
+msgid "<ahelp hid=\".\">Lists the names of the data base fields in the selected table or query.</ahelp> Click to select a field or hold down the Shift or the <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while you click to select more than one field."
+msgstr ""
#: 01090100.xhp
msgctxt ""
@@ -2477,8 +2477,8 @@ msgctxt ""
"01090100.xhp\n"
"par_id3148538\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGFORM_CMDMOVESELECTED\">Click to move the selected field(s) to the box that the arrow is pointing to.</ahelp>"
-msgstr "<ahelp hid=\"HID_DLGFORM_CMDMOVESELECTED\">单击以将所有选中的字段移到箭头所指的框中。</ahelp>"
+msgid "<ahelp hid=\".\">Click to move the selected field(s) to the box that the arrow is pointing to.</ahelp>"
+msgstr ""
#: 01090100.xhp
msgctxt ""
@@ -2493,8 +2493,8 @@ msgctxt ""
"01090100.xhp\n"
"par_id3145121\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGFORM_CMDMOVEALL\">Click to move all fields to the box that the arrow is pointing to.</ahelp>"
-msgstr "<ahelp hid=\"HID_DLGFORM_CMDMOVEALL\">单击以将所有字段移到箭头所指的框中。</ahelp>"
+msgid "<ahelp hid=\".\">Click to move all fields to the box that the arrow is pointing to.</ahelp>"
+msgstr ""
#: 01090100.xhp
msgctxt ""
@@ -2509,8 +2509,8 @@ msgctxt ""
"01090100.xhp\n"
"par_id3149763\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGFORM_CMDREMOVESELECTED\">Click to move the selected field(s) to the box that the arrow is pointing to.</ahelp>"
-msgstr "<ahelp hid=\"HID_DLGFORM_CMDREMOVESELECTED\">单击以将所有选中的字段移到箭头所指的框中。</ahelp>"
+msgid "<ahelp hid=\".\">Click to move the selected field(s) to the box that the arrow is pointing to.</ahelp>"
+msgstr ""
#: 01090100.xhp
msgctxt ""
@@ -2525,8 +2525,8 @@ msgctxt ""
"01090100.xhp\n"
"par_id3156329\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGFORM_CMDREMOVEALL\">Click to move all fields to the box that the arrow is pointing to.</ahelp>"
-msgstr "<ahelp hid=\"HID_DLGFORM_CMDREMOVEALL\">单击以将所有字段移到箭头所指的框中。</ahelp>"
+msgid "<ahelp hid=\".\">Click to move all fields to the box that the arrow is pointing to.</ahelp>"
+msgstr ""
#: 01090100.xhp
msgctxt ""
@@ -2573,8 +2573,8 @@ msgctxt ""
"01090100.xhp\n"
"par_id3156194\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGFORM_FIELDSSELECTED\">Displays the fields that are in the new form.</ahelp>"
-msgstr "<ahelp hid=\"HID_DLGFORM_FIELDSSELECTED\" visibility=\"visible\">显示将在新表格中包括的所有字段。</ahelp>"
+msgid "<ahelp hid=\".\">Displays the fields that are in the new form.</ahelp>"
+msgstr ""
#: 01090100.xhp
msgctxt ""
@@ -2949,8 +2949,8 @@ msgctxt ""
"01090300.xhp\n"
"par_id3151210\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGFORM_CMDALIGNLEFT\">The labels are left-aligned.</ahelp>"
-msgstr "<ahelp hid=\"HID_DLGFORM_CMDALIGNLEFT\" visibility=\"visible\">标签左对齐。</ahelp>"
+msgid "<ahelp hid=\".\">The labels are left-aligned.</ahelp>"
+msgstr ""
#: 01090300.xhp
msgctxt ""
@@ -2965,8 +2965,8 @@ msgctxt ""
"01090300.xhp\n"
"par_id3148672\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGFORM_CMDALIGNRIGHT\">The labels are right-aligned.</ahelp>"
-msgstr "<ahelp hid=\"HID_DLGFORM_CMDALIGNRIGHT\" visibility=\"visible\">标签字段右对齐。</ahelp>"
+msgid "<ahelp hid=\".\">The labels are right-aligned.</ahelp>"
+msgstr ""
#: 01090300.xhp
msgctxt ""
@@ -2989,8 +2989,8 @@ msgctxt ""
"01090300.xhp\n"
"par_id3149388\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGFORM_CMDLEFTLABELED\">Aligns the database fields column-wise with the labels to the left of the fields.</ahelp>"
-msgstr "<ahelp hid=\"HID_DLGFORM_CMDLEFTLABELED\" visibility=\"visible\">按列对齐数据库字段,标签位于字段左侧。</ahelp>"
+msgid "<ahelp hid=\".\">Aligns the database fields column-wise with the labels to the left of the fields.</ahelp>"
+msgstr ""
#: 01090300.xhp
msgctxt ""
@@ -3005,8 +3005,8 @@ msgctxt ""
"01090300.xhp\n"
"par_id3150355\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGFORM_CMDTOPLABELED\">Aligns the database fields column-wise with the labels above the field.</ahelp>"
-msgstr "<ahelp hid=\"HID_DLGFORM_CMDTOPLABELED\" visibility=\"visible\">按列对齐数据库字段,标签位于字段上方。</ahelp>"
+msgid "<ahelp hid=\".\">Aligns the database fields column-wise with the labels above the field.</ahelp>"
+msgstr ""
#: 01090300.xhp
msgctxt ""
@@ -3021,8 +3021,8 @@ msgctxt ""
"01090300.xhp\n"
"par_id3153824\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGFORM_CMDTABLESTYLE\">Aligns the database fields in a tabular form.</ahelp>"
-msgstr "<ahelp hid=\"HID_DLGFORM_CMDTABLESTYLE\" visibility=\"visible\">将数据库字段以表格形式对齐。</ahelp>"
+msgid "<ahelp hid=\".\">Aligns the database fields in a tabular form.</ahelp>"
+msgstr ""
#: 01090300.xhp
msgctxt ""
@@ -3037,8 +3037,8 @@ msgctxt ""
"01090300.xhp\n"
"par_id3155421\n"
"help.text"
-msgid "<ahelp hid=\"HID_DLGFORM_CMDTOPJUSTIFIED\">Arranges the labels above the corresponding data.</ahelp>"
-msgstr "<ahelp hid=\"HID_DLGFORM_CMDTOPJUSTIFIED\" visibility=\"visible\">将标签排列在相应数据的上方。</ahelp>"
+msgid "<ahelp hid=\".\">Arranges the labels above the corresponding data.</ahelp>"
+msgstr ""
#: 01090300.xhp
msgctxt ""
@@ -3285,8 +3285,8 @@ msgctxt ""
"01090500.xhp\n"
"par_idN10561\n"
"help.text"
-msgid "<ahelp hid=\".\">Specifies the field border style.</ahelp>"
-msgstr "<ahelp hid=\".\">指定字段边框样式。</ahelp>"
+msgid "Specifies the field border style."
+msgstr ""
#: 01090500.xhp
msgctxt ""
@@ -3365,8 +3365,8 @@ msgctxt ""
"01090600.xhp\n"
"par_idN10553\n"
"help.text"
-msgid "<ahelp hid=\".\">Specifies the name of the form and how to proceed.</ahelp>"
-msgstr "<ahelp hid=\".\">指定窗体的名称并说明如何继续。</ahelp>"
+msgid "Specifies the name of the form and how to proceed."
+msgstr ""
#: 01090600.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 f70aaa263a9..9bd60b7c256 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-10-04 11:48+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\n"
"PO-Revision-Date: 2016-07-07 00:07+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13317,7 +13317,7 @@ msgctxt ""
"microsoft_terms.xhp\n"
"par_id3147048\n"
"help.text"
-msgid "<link href=\"text/shared/01/02230200.xhp\" name=\"Track Changes - Show Changes\">Track Changes - Show Changes</link>"
+msgid "<link href=\"text/shared/01/02230200.xhp\" name=\"Track Changes - Show\">Track Changes - Show</link>"
msgstr ""
#: microsoft_terms.xhp
@@ -15429,7 +15429,7 @@ msgctxt ""
"protection.xhp\n"
"par_id3153104\n"
"help.text"
-msgid "Choose <emph>Edit - Track Changes - Protect Changes</emph>. Enter and confirm a password of at least one character."
+msgid "Choose <emph>Edit - Track Changes - Protect</emph>. Enter and confirm a password of at least one character."
msgstr ""
#: protection.xhp
@@ -15445,7 +15445,7 @@ msgctxt ""
"protection.xhp\n"
"par_id3152920\n"
"help.text"
-msgid "Choose <emph>Edit - Track Changes - Protect Changes</emph>. Enter the correct password."
+msgid "Choose <emph>Edit - Track Changes - Protect</emph>. Enter the correct password."
msgstr ""
#: protection.xhp
@@ -15693,7 +15693,7 @@ msgctxt ""
"redlining_accept.xhp\n"
"par_id3153748\n"
"help.text"
-msgid "Open the document and choose <emph>Edit - Track Changes - Manage Changes</emph>. The <emph>Manage Changes</emph> dialog appears."
+msgid "Open the document and choose <emph>Edit - Track Changes - Manage</emph>. The <emph>Manage Changes</emph> dialog appears."
msgstr ""
#: redlining_accept.xhp
@@ -15773,8 +15773,8 @@ msgctxt ""
"redlining_doccompare.xhp\n"
"par_id9948423\n"
"help.text"
-msgid "Normally, the reviewers enable change tracking by <emph>Edit - Track Changes - Record Changes</emph> and you can easily see the changes."
-msgstr "一般情况下,审阅者通过<emph>编辑 - 修订 - 记录</emph>启用修改跟踪,您就可以很容易看到修改的内容。"
+msgid "Normally, the reviewers enable change tracking by <emph>Edit - Track Changes - Record</emph> and you can easily see the changes."
+msgstr ""
#: redlining_doccompare.xhp
msgctxt ""
@@ -15957,7 +15957,7 @@ msgctxt ""
"redlining_enter.xhp\n"
"par_id3149095\n"
"help.text"
-msgid "To start recording changes, open the document to be edited and choose <link href=\"text/shared/01/02230000.xhp\" name=\"Edit - Track Changes\"><emph>Edit - Track Changes</emph></link> and then choose <emph>Record Changes</emph>."
+msgid "To start recording changes, open the document to be edited and choose <link href=\"text/shared/01/02230000.xhp\" name=\"Edit - Track Changes\"><emph>Edit - Track Changes</emph></link> and then choose <emph>Record</emph>."
msgstr ""
#: redlining_enter.xhp
@@ -16005,7 +16005,7 @@ msgctxt ""
"redlining_enter.xhp\n"
"par_id3148473\n"
"help.text"
-msgid "You can enter a comment on each recorded change by placing the cursor in the area of the change and then choosing <emph>Edit - Track Changes - Comment on Change</emph>. In addition to Extended Tips, the comment is also displayed in the list in the <link href=\"text/shared/01/02230400.xhp\" name=\"Manage Changes\"><emph>Manage Changes</emph></link> dialog."
+msgid "You can enter a comment on each recorded change by placing the cursor in the area of the change and then choosing <emph>Edit - Track Changes - Comment</emph>. In addition to Extended Tips, the comment is also displayed in the list in the <link href=\"text/shared/01/02230400.xhp\" name=\"Manage Changes\"><emph>Manage Changes</emph></link> dialog."
msgstr ""
#: redlining_enter.xhp
@@ -16013,7 +16013,7 @@ msgctxt ""
"redlining_enter.xhp\n"
"par_id3153542\n"
"help.text"
-msgid "To stop recording changes, choose <emph>Edit - Track Changes - Record Changes</emph> again. The check mark is removed and you can now save the document."
+msgid "To stop recording changes, choose <emph>Edit - Track Changes - Record</emph> again. The check mark is removed and you can now save the document."
msgstr ""
#: redlining_enter.xhp
@@ -16077,24 +16077,24 @@ msgctxt ""
"redlining_navigation.xhp\n"
"par_id3153883\n"
"help.text"
-msgid "<emph>Edit - Track Changes - Next Change</emph>: <ahelp hid=\".uno:NextTrackedChange\">Jumps to and selects the next change in the document, if any.</ahelp>"
-msgstr "<emph>编辑 - 修订 - 下一处修订</emph>: <ahelp hid=\".uno:NextTrackedChange\">跳转到并选中文档中的下一处修订,如果存在的话。</ahelp>"
+msgid "<emph>Edit - Track Changes - Next</emph>: <ahelp hid=\".uno:NextTrackedChange\">Jumps to and selects the next change in the document, if any.</ahelp>"
+msgstr ""
#: redlining_navigation.xhp
msgctxt ""
"redlining_navigation.xhp\n"
"par_id3153884\n"
"help.text"
-msgid "<emph>Edit - Track Changes - Previous Change</emph>: <ahelp hid=\".uno:PreviousTrackedChange\">Jumps to and selects the previous change in the document, if any.</ahelp>"
-msgstr "<emph>编辑 - 修订 - 上一处修订</emph>: <ahelp hid=\".uno:PreviousTrackedChange\">跳转到并选中文档中的上一处修订,如果存在的话。</ahelp>"
+msgid "<emph>Edit - Track Changes - Previous</emph>: <ahelp hid=\".uno:PreviousTrackedChange\">Jumps to and selects the previous change in the document, if any.</ahelp>"
+msgstr ""
#: redlining_navigation.xhp
msgctxt ""
"redlining_navigation.xhp\n"
"par_id3153885\n"
"help.text"
-msgid "Using these commands in conjunction with the <emph>Accept Change</emph> and <emph>Reject Change</emph> commands allows navigating, accepting and rejecting changes without invoking the <emph>Edit - Track Changes - Manage Changes</emph> dialog."
-msgstr "将这些命令与 <emph>接受修订</emph> 和 <emph>否决修订</emph> 命令结合起来,可以不必打开 <emph>编辑 - 修订 - 接受或否决</emph> 对话框,直接浏览、接受与否决修订。"
+msgid "Using these commands in conjunction with the <emph>Accept</emph> and <emph>Reject</emph> commands allows navigating, accepting and rejecting changes without invoking the <emph>Edit - Track Changes - Manage</emph> dialog."
+msgstr ""
#: redlining_protect.xhp
msgctxt ""
@@ -16133,7 +16133,7 @@ msgctxt ""
"redlining_protect.xhp\n"
"par_id3154751\n"
"help.text"
-msgid "To protect the changes made in a document during editing, choose <emph>Edit - Track Changes - Protect Changes</emph>. To turn off the function or to accept or reject changes it is necessary to enter the correct password first."
+msgid "To protect the changes made in a document during editing, choose <emph>Edit - Track Changes - Protect</emph>. To turn off the function or to accept or reject changes it is necessary to enter the correct password first."
msgstr ""
#: redlining_protect.xhp
@@ -16141,7 +16141,7 @@ msgctxt ""
"redlining_protect.xhp\n"
"par_id3147088\n"
"help.text"
-msgid "Choose <emph>Protect Changes</emph>. This opens the <link href=\"text/shared/01/password_dlg.xhp\" name=\"Password\"><emph>Password</emph></link> dialog."
+msgid "Choose <emph>Protect</emph>. This opens the <link href=\"text/shared/01/password_dlg.xhp\" name=\"Password\"><emph>Password</emph></link> dialog."
msgstr ""
#: redlining_protect.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/shared/optionen.po b/source/zh-CN/helpcontent2/source/text/shared/optionen.po
index d6698830b2f..aafd5f7bd61 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-10-04 11:48+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\n"
"PO-Revision-Date: 2017-07-04 02:13+0000\n"
"Last-Translator: Voina i Mir <shanshandehongxing@outlook.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1645,15 +1645,15 @@ msgctxt ""
"01010400.xhp\n"
"hd_id3155175\n"
"help.text"
-msgid "Suggestion"
-msgstr "建议"
+msgid "Replace By or Grammar By"
+msgstr ""
#: 01010400.xhp
msgctxt ""
"01010400.xhp\n"
"par_id3147323\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/editdictionarydialog/replace\">This input field is only available if you are editing an exception dictionary. The field shows the alternative suggestion for the current word in the \"Word\" text box.</ahelp>"
+msgid "<ahelp hid=\"cui/ui/editdictionarydialog/replace\">This input field is only available if you are editing an exception dictionary or a language-dependent custom dictionary. In exception dictionaries, the field shows the alternative suggestion for the current word in the \"Word\" text box. In language-dependent custom dictionaries, the field contains a known root word, as a model of affixation of the new word or its usage in compound words. For example, in a German custom dictionary, the new word “Litschi” (lychee) with the model word “Gummi” (gum) will result recognition of “Litschis” (lychees), “Litschibaum” (lychee tree), “Litschifrucht” (lychee fruit) etc.</ahelp>"
msgstr ""
#: 01010400.xhp
@@ -6229,8 +6229,8 @@ msgctxt ""
"01040600.xhp\n"
"bm_id3144510\n"
"help.text"
-msgid "<bookmark_value>non-printing characters (Writer)</bookmark_value><bookmark_value>displaying; non-printing characters (Writer)</bookmark_value><bookmark_value>paragraph marks; displaying (Writer)</bookmark_value><bookmark_value>characters; displaying only on screen (Writer)</bookmark_value><bookmark_value>optional hyphens (Writer)</bookmark_value><bookmark_value>soft hyphens (Writer)</bookmark_value><bookmark_value>hyphens; displaying custom (Writer)</bookmark_value><bookmark_value>custom hyphens (Writer)</bookmark_value><bookmark_value>spaces; displaying (Writer)</bookmark_value><bookmark_value>spaces; showing protected spaces (Writer)</bookmark_value><bookmark_value>protected spaces; showing (Writer)</bookmark_value><bookmark_value>non-breaking spaces (Writer)</bookmark_value><bookmark_value>tab stops; displaying (Writer)</bookmark_value><bookmark_value>break display (Writer)</bookmark_value><bookmark_value>hidden text;showing (Writer)</bookmark_value><bookmark_value>hidden fields display (Writer)</bookmark_value><bookmark_value>paragraphs; hidden paragraphs (Writer)</bookmark_value><bookmark_value>cursor; allowing in protected areas (Writer)</bookmark_value>"
-msgstr "<bookmark_value>非打印字符 (Writer)</bookmark_value><bookmark_value>显示; 非打印字符 (Writer)</bookmark_value><bookmark_value>段落标记; 显示 (Writer)</bookmark_value><bookmark_value>字符; 仅显示在屏幕上 (Writer)</bookmark_value><bookmark_value>可选的连字符 (Writer)</bookmark_value><bookmark_value>连字符; 显示自定义的 (Writer)</bookmark_value><bookmark_value>自定义的连字符 (Writer)</bookmark_value><bookmark_value>空格; 显示 (Writer)</bookmark_value><bookmark_value>空格; 显示受保护的空格 (Writer)</bookmark_value><bookmark_value>受保护的空格; 显示 (Writer)</bookmark_value><bookmark_value>不间断空格 (Writer)</bookmark_value><bookmark_value>制表位; 显示 (Writer)</bookmark_value><bookmark_value>分隔符显示 (Writer)</bookmark_value><bookmark_value>隐藏文本; 显示 (Writer)</bookmark_value><bookmark_value>隐藏字段显示 (Writer)</bookmark_value><bookmark_value>段落; 隐藏段落 (Writer)</bookmark_value><bookmark_value>光标; 允许在受保护区域中 (Writer)</bookmark_value>"
+msgid "<bookmark_value>non-printing characters (Writer)</bookmark_value><bookmark_value>formatting marks (Writer)</bookmark_value><bookmark_value>displaying; non-printing characters (Writer)</bookmark_value><bookmark_value>displaying; formatting marks (Writer)</bookmark_value><bookmark_value>paragraph marks; displaying (Writer)</bookmark_value><bookmark_value>characters; displaying only on screen (Writer)</bookmark_value><bookmark_value>optional hyphens (Writer)</bookmark_value><bookmark_value>soft hyphens (Writer)</bookmark_value><bookmark_value>hyphens; displaying custom (Writer)</bookmark_value><bookmark_value>custom hyphens (Writer)</bookmark_value><bookmark_value>spaces; displaying (Writer)</bookmark_value><bookmark_value>spaces; showing protected spaces (Writer)</bookmark_value><bookmark_value>protected spaces; showing (Writer)</bookmark_value><bookmark_value>non-breaking spaces (Writer)</bookmark_value><bookmark_value>tab stops; displaying (Writer)</bookmark_value><bookmark_value>break display (Writer)</bookmark_value><bookmark_value>hidden text;showing (Writer)</bookmark_value><bookmark_value>hidden fields display (Writer)</bookmark_value><bookmark_value>paragraphs; hidden paragraphs (Writer)</bookmark_value><bookmark_value>cursor; allowing in protected areas (Writer)</bookmark_value>"
+msgstr ""
#: 01040600.xhp
msgctxt ""
@@ -6261,8 +6261,8 @@ msgctxt ""
"01040600.xhp\n"
"par_id3156343\n"
"help.text"
-msgid "Defines which non-printing characters are visible on screen. Activate the <link href=\"text/swriter/01/03100000.xhp\" name=\"Non-printing Characters On/Off\"><emph>Non-printing Characters</emph></link> icon on the <emph>Standard</emph> bar. All characters that you have selected on the <emph>Formatting Aids</emph> tab page will be displayed."
-msgstr "定义要在屏幕显示哪些非打印字符。激活<emph>标准</emph>栏上的<link href=\"text/swriter/01/03100000.xhp\" name=\"打开/关闭非打印字符\"><emph>非打印字符</emph></link>图标。所有在<emph>格式化助理</emph>选项卡页面中选择的字符都将显示。"
+msgid "Defines which formatting marks are visible on screen. Activate the <link href=\"text/swriter/01/03100000.xhp\" name=\"Formatting marks On/Off\"><emph>Formatting Marks</emph></link> icon on the <emph>Standard</emph> bar. All characters that you have selected on the <emph>Formatting Aids</emph> tab page will be displayed."
+msgstr ""
#: 01040600.xhp
msgctxt ""
@@ -6373,7 +6373,7 @@ msgctxt ""
"01040600.xhp\n"
"par_idN108FB\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/optformataidspage/hiddentext\">Displays text that uses the character format \"hidden\", when <emph>View - Non-printing Characters</emph> is enabled.</ahelp>"
+msgid "<ahelp hid=\"modules/swriter/ui/optformataidspage/hiddentext\">Displays text that uses the character format \"hidden\", when <emph>View - Formatting Marks</emph> is enabled.</ahelp>"
msgstr ""
#: 01040600.xhp
@@ -6573,8 +6573,8 @@ msgctxt ""
"01040700.xhp\n"
"par_id3156153\n"
"help.text"
-msgid "To record or show changes in your text or spreadsheet document, choose <link href=\"text/shared/01/02230000.xhp\" name=\"Edit - Track Changes\"><emph>Edit - Track Changes - Record Changes</emph></link> or <emph>Edit - Track Changes - Show Changes</emph>."
-msgstr "要记录或显示文本或电子表格文档中的更改,请选择<link href=\"text/shared/01/02230000.xhp\" name=\"编辑 - 更改\"><emph>编辑 - 更改 - 记录</emph></link>或<emph>编辑 - 更改 - 显示</emph>。"
+msgid "To record or show changes in your text or spreadsheet document, choose <link href=\"text/shared/01/02230000.xhp\" name=\"Edit - Track Changes\"><emph>Edit - Track Changes - Record</emph></link> or <emph>Edit - Track Changes - Show</emph>."
+msgstr ""
#: 01040700.xhp
msgctxt ""
@@ -7781,7 +7781,7 @@ msgctxt ""
"01050100.xhp\n"
"par_id3149516\n"
"help.text"
-msgid "<variable id=\"rastersicht\"><ahelp hid=\"svx/ui/optgridpage/gridvisible\">Specifies whether to display the grid.</ahelp></variable>"
+msgid "<variable id=\"rastersicht\"><ahelp hid=\".\">Specifies whether to display the grid.</ahelp></variable>"
msgstr ""
#: 01050100.xhp
@@ -9509,7 +9509,7 @@ msgctxt ""
"01060600.xhp\n"
"par_id3156343\n"
"help.text"
-msgid "To record changes to your work, choose <link href=\"text/shared/01/02230000.xhp\" name=\"Edit - Track Changes - Record Changes\"><emph>Edit - Track Changes - Record Changes</emph></link>."
+msgid "To record changes to your work, choose <link href=\"text/shared/01/02230000.xhp\" name=\"Edit - Track Changes - Record\"><emph>Edit - Track Changes - Record</emph></link>."
msgstr ""
#: 01060600.xhp
@@ -10301,7 +10301,7 @@ msgctxt ""
"01070100.xhp\n"
"par_id3154147\n"
"help.text"
-msgid "<variable id=\"helplines\"><variable id=\"verschieb\"><ahelp hid=\"modules/simpress/ui/sdviewpage/dragstripes\">Specifies whether to display guides when moving an object.</ahelp></variable></variable>"
+msgid "<variable id=\"helplines\"><variable id=\"verschieb\"><ahelp hid=\".\">Specifies whether to display guides when moving an object.</ahelp></variable></variable>"
msgstr ""
#: 01070100.xhp
@@ -12053,8 +12053,8 @@ msgctxt ""
"01140000.xhp\n"
"par_id3145121\n"
"help.text"
-msgid "<ahelp hid=\".\">Specifies the date acceptance patterns for the current locale. Calc spreadsheet and Writer table cell input needs to match locale dependent date acceptance patterns before it is recognized as a valid date.</ahelp> Default locale dependent date acceptance patterns are generated build time, but it is possible to add more or modify them in this edit box."
-msgstr "<ahelp hid=\".\">指定当前区域设置接受的日期匹配格式。Calc 电子表格与 Writer 表格单元格的输入需要匹配与区域相关的日期接受匹配格式方可识别为有效日期。</ahelp>默认的区域相关日期接受匹配格式在编译时生成,但也可以在本编辑框中添加更多或修改现有匹配格式。"
+msgid "<ahelp hid=\".\">Specifies the date acceptance patterns for the current locale. Calc spreadsheet and Writer table cell input needs to match locale dependent date acceptance patterns before it is recognized as a valid date.</ahelp> Default locale dependent date acceptance patterns are generated during build time, but it is possible to add more or modify them in this edit box."
+msgstr ""
#: 01140000.xhp
msgctxt ""
@@ -12069,8 +12069,8 @@ msgctxt ""
"01140000.xhp\n"
"par_id3157939\n"
"help.text"
-msgid "Syntax: <emph>Y</emph> means year, <emph>M</emph> means month, and <emph>D</emph> means day, regardless of localizaton."
-msgstr "语法: <emph>Y</emph> 代表年份,<emph>M</emph> 代表月份,而 <emph>D</emph> 代表天,与本地化设置无关。"
+msgid "Syntax: <emph>Y</emph> means year, <emph>M</emph> means month, and <emph>D</emph> means day, regardless of localization."
+msgstr ""
#: 01140000.xhp
msgctxt ""
@@ -12989,8 +12989,8 @@ msgctxt ""
"01160201.xhp\n"
"par_idN1053E\n"
"help.text"
-msgid "Creates or edits an entry in the <link href=\"text/shared/optionen/01160200.xhp\">Databases</link> tab page."
-msgstr "在<link href=\"text/shared/optionen/01160200.xhp\">数据库</link>选项卡页面上创建或编辑条目。"
+msgid "<ahelp hid=\".\">Creates or edits an entry in the <link href=\"text/shared/optionen/01160200.xhp\">Databases</link> tab page.</ahelp>"
+msgstr ""
#: 01160201.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/simpress/guide.po b/source/zh-CN/helpcontent2/source/text/simpress/guide.po
index 5265a9df31e..b7c6f2e9dbf 100644
--- a/source/zh-CN/helpcontent2/source/text/simpress/guide.po
+++ b/source/zh-CN/helpcontent2/source/text/simpress/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-10-04 11:48+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\n"
"PO-Revision-Date: 2016-07-05 09:48+0000\n"
"Last-Translator: 琨珑 锁 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3781,7 +3781,7 @@ msgctxt ""
"masterpage.xhp\n"
"par_id3154017\n"
"help.text"
-msgid "Every slide in a presentation has exactly one master slide, also known as master slide. A master slide determines the text formatting style for the title and outline and the background design for all slides that use this master slide."
+msgid "Every slide in a presentation has exactly one master slide, also known as master page. A master slide determines the text formatting style for the title and outline and the background design for all slides that use this master slide."
msgstr ""
#: masterpage.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/swriter/00.po b/source/zh-CN/helpcontent2/source/text/swriter/00.po
index fcbc0dd296f..3aafb93dc69 100644
--- a/source/zh-CN/helpcontent2/source/text/swriter/00.po
+++ b/source/zh-CN/helpcontent2/source/text/swriter/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-10-04 11:48+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\n"
"PO-Revision-Date: 2017-01-20 05:17+0000\n"
"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -405,8 +405,8 @@ msgctxt ""
"00000403.xhp\n"
"par_id3155625\n"
"help.text"
-msgid "Choose <emph>View - Non-printing Characters</emph>"
-msgstr "选择<emph>视图 - 非打印字符</emph>"
+msgid "Choose <emph>View - Formatting Marks</emph>"
+msgstr ""
#: 00000403.xhp
msgctxt ""
@@ -437,8 +437,8 @@ msgctxt ""
"00000403.xhp\n"
"par_id3153716\n"
"help.text"
-msgid "Non-printing Characters"
-msgstr "非打印字符"
+msgid "Formatting Marks"
+msgstr ""
#: 00000403.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/swriter/01.po b/source/zh-CN/helpcontent2/source/text/swriter/01.po
index f1015b984e9..28bbc286f24 100644
--- a/source/zh-CN/helpcontent2/source/text/swriter/01.po
+++ b/source/zh-CN/helpcontent2/source/text/swriter/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-10-04 11:48+0200\n"
+"POT-Creation-Date: 2017-11-22 13:53+0100\n"
"PO-Revision-Date: 2016-07-07 00:13+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3349,8 +3349,8 @@ msgctxt ""
"03080000.xhp\n"
"par_id3153540\n"
"help.text"
-msgid "<link href=\"text/swriter/01/03100000.xhp\" name=\"Non-printing Characters On/Off\">Non-printing Characters On/Off</link>"
-msgstr "<link href=\"text/swriter/01/03100000.xhp\" name=\"打开/关闭非打印字符\">打开/关闭非打印字符</link>"
+msgid "<link href=\"text/swriter/01/03100000.xhp\" name=\"Formatting Marks On/Off\">Formatting Marks On/Off</link>"
+msgstr ""
#: 03090000.xhp
msgctxt ""
@@ -3405,16 +3405,16 @@ msgctxt ""
"03100000.xhp\n"
"tit\n"
"help.text"
-msgid "Non-printing Characters"
-msgstr "非打印字符"
+msgid "Formatting Marks"
+msgstr ""
#: 03100000.xhp
msgctxt ""
"03100000.xhp\n"
"hd_id3154507\n"
"help.text"
-msgid "<link href=\"text/swriter/01/03100000.xhp\" name=\"Non-printing Characters\">Non-printing Characters</link>"
-msgstr "<link href=\"text/swriter/01/03100000.xhp\" name=\"非打印字符\">非打印字符</link>"
+msgid "<link href=\"text/swriter/01/03100000.xhp\" name=\"Formatting Marks\">Formatting Marks</link>"
+msgstr ""
#: 03100000.xhp
msgctxt ""
@@ -3437,8 +3437,8 @@ msgctxt ""
"03100000.xhp\n"
"par_id3147511\n"
"help.text"
-msgid "To specify which non-printing characters are displayed, choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><item type=\"menuitem\">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type=\"menuitem\">Tools - Options</item></defaultinline></switchinline><emph> - </emph><link href=\"text/shared/optionen/01040600.xhp\" name=\"Writer - Formatting Aids\"><emph>%PRODUCTNAME Writer - Formatting Aids</emph></link>, and then select the options that you want in the <emph>Display of</emph> area."
-msgstr "要指定显示哪些非打印字符,请选择<emph><switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - 首选项</caseinline><defaultinline>工具 - 选项</defaultinline></switchinline> - <link href=\"text/shared/optionen/01040600.xhp\" name=\"Writer - Formatting Aids\">%PRODUCTNAME Writer - 格式化辅助</link></emph>,然后选择要在<emph>显示</emph>区域显示的选项。"
+msgid "To specify which formatting marks are displayed, choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><item type=\"menuitem\">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type=\"menuitem\">Tools - Options</item></defaultinline></switchinline><emph> - </emph><link href=\"text/shared/optionen/01040600.xhp\" name=\"Writer - Formatting Aids\"><emph>%PRODUCTNAME Writer - Formatting Aids</emph></link>, and then select the options that you want in the <emph>Display of</emph> area."
+msgstr ""
#: 03120000.xhp
msgctxt ""
@@ -20117,7 +20117,7 @@ msgctxt ""
"05140000.xhp\n"
"par_id3146333\n"
"help.text"
-msgid "<ahelp hid=\"SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE\">The manually formatted attributes of the text at the cursor position in the document will be added to the style that is selected in the Styles window.</ahelp>"
+msgid "<ahelp hid=\".\">The manually formatted attributes of the text at the cursor position in the document will be added to the style that is selected in the Styles window.</ahelp>"
msgstr ""
#: 05140000.xhp
@@ -26229,7 +26229,7 @@ msgctxt ""
"title_page.xhp\n"
"par_id300920161443293374\n"
"help.text"
-msgid "Note: Using the Default (or any other) page style for your document, you can add a header or footer as you wish to the first page by deselecting the <item type=\"menuitem\">Same content on first page</item> option on the header/footer tabs in the <emph>Page Style</emph> dialog, and then adding the header or footer. You can then add a different header or footer to the other pages of the document."
+msgid "Using the Default (or any other) page style for your document, you can add a header or footer as you wish to the first page by deselecting the <item type=\"menuitem\">Same content on first page</item> option on the header/footer tabs in the <emph>Page Style</emph> dialog, and then adding the header or footer. You can then add a different header or footer to the other pages of the document."
msgstr ""
#: title_page.xhp
@@ -26277,7 +26277,7 @@ msgctxt ""
"title_page.xhp\n"
"par_id300920161448355764\n"
"help.text"
-msgid "Note: By default, %PRODUCTNAME selects the <emph>First page</emph> page style."
+msgid "By default, %PRODUCTNAME selects the <emph>First Page</emph> page style."
msgstr ""
#: title_page.xhp
@@ -26301,7 +26301,7 @@ msgctxt ""
"title_page.xhp\n"
"par_id300920161443314375\n"
"help.text"
-msgid "This will change the current page style to <emph>First page</emph> and the following pages will have the <emph>Default page</emph> style"
+msgid "This will change the current page style to <emph>First Page</emph> and the following pages will have the <emph>Default Style</emph>."
msgstr ""
#: title_page.xhp
@@ -26373,7 +26373,7 @@ msgctxt ""
"title_page.xhp\n"
"par_id300920161443324067\n"
"help.text"
-msgid "This will insert a page break and change the current page style to <emph>First page</emph>. The following pages will have the default page style."
+msgid "This will insert a page break and change the current page style to <emph>First Page</emph>. The following pages will have the <emph>Default Style</emph> page style."
msgstr ""
#: title_page.xhp
@@ -26389,7 +26389,7 @@ msgctxt ""
"title_page.xhp\n"
"par_id30092016144332559\n"
"help.text"
-msgid "You cannot delete a title page. You must change its page style format from First page to whatever other page style you wish."
+msgid "You cannot delete a title page. You must change its page style format from <emph>First Page</emph> to whatever other page style you wish."
msgstr ""
#: title_page.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/swriter/02.po b/source/zh-CN/helpcontent2/source/text/swriter/02.po
index ca289883678..bd1154dc15b 100644
--- a/source/zh-CN/helpcontent2/source/text/swriter/02.po
+++ b/source/zh-CN/helpcontent2/source/text/swriter/02.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-11-22 13:53+0100\n"
"PO-Revision-Date: 2016-05-25 06:42+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1165,8 +1165,8 @@ msgctxt ""
"14020000.xhp\n"
"par_id3143270\n"
"help.text"
-msgid "<ahelp hid=\"FN_FORMULA_CALC\">Opens a submenu, from which you can insert a formula into the cell of a table.</ahelp> Place the cursor in a cell in the table or at the position in the document where you want the result to appear. Click the<emph> Formula </emph>icon and choose the desired formula from the submenu."
-msgstr "<ahelp hid=\"FN_FORMULA_CALC\">打开子菜单,可以从中选择公式并插入到表格的单元格中。</ahelp>将光标置于希望显示结果的表格单元格或文档的某个位置上。单击<emph>公式</emph>图标并从子菜单中选择要使用的公式。"
+msgid "<ahelp hid=\".\">Opens a submenu, from which you can insert a formula into the cell of a table.</ahelp> Place the cursor in a cell in the table or at the position in the document where you want the result to appear. Click the<emph> Formula </emph>icon and choose the desired formula from the submenu."
+msgstr ""
#: 14020000.xhp
msgctxt ""
@@ -2453,8 +2453,8 @@ msgctxt ""
"14030000.xhp\n"
"par_id3149602\n"
"help.text"
-msgid "<ahelp hid=\"FN_FORMULA_CANCEL\">Clears the contents of the input line and closes the formula bar.</ahelp>"
-msgstr "<ahelp hid=\"FN_FORMULA_CANCEL\">清除编辑栏中的内容,同时关闭公式编辑栏。</ahelp>"
+msgid "<ahelp hid=\".\">Clears the contents of the input line and closes the formula bar.</ahelp>"
+msgstr ""
#: 14030000.xhp
msgctxt ""
@@ -2493,8 +2493,8 @@ msgctxt ""
"14040000.xhp\n"
"par_id3147173\n"
"help.text"
-msgid "<ahelp hid=\"FN_FORMULA_APPLY\" visibility=\"visible\">Transfers the contents of the input line into your document and closes the formula bar. The contents of the input line are inserted at the cursor position in the document.</ahelp>"
-msgstr "<ahelp hid=\"FN_FORMULA_APPLY\" visibility=\"visible\">将编辑栏的内容传送到文档中,并关闭公式编辑栏。编辑栏的内容将被插入到文档中光标所在的位置。</ahelp>"
+msgid "<ahelp hid=\".\">Transfers the contents of the input line into your document and closes the formula bar. The contents of the input line are inserted at the cursor position in the document.</ahelp>"
+msgstr ""
#: 14040000.xhp
msgctxt ""
@@ -2533,8 +2533,8 @@ msgctxt ""
"14050000.xhp\n"
"par_id3154501\n"
"help.text"
-msgid "<ahelp visibility=\"visible\" hid=\"HID_EDIT_FORMULA\">Allows you to create a formula by typing it directly into the input line or by clicking the <emph>Formula</emph> icon to display the formulas in submenu.</ahelp>"
-msgstr "<ahelp visibility=\"visible\" hid=\"HID_EDIT_FORMULA\">您可以在编辑栏中直接键入公式,也可以单击<emph>公式</emph>图标以便在子菜单中显示公式。</ahelp>"
+msgid "<ahelp hid=\".\">Allows you to create a formula by typing it directly into the input line or by clicking the <emph>Formula</emph> icon to display the formulas in submenu.</ahelp>"
+msgstr ""
#: 14050000.xhp
msgctxt ""