aboutsummaryrefslogtreecommitdiff
path: root/source/zh-CN/helpcontent2
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2020-04-29 23:23:16 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2020-04-29 23:28:46 +0200
commit2a61ce8496f6a5633af3ec710882358c3836abd0 (patch)
treee7ce6b15f564f773937ba697696b6f89aea04667 /source/zh-CN/helpcontent2
parent6b2e705c5e47924cfa7c0ae90ab9d5d69cf87cb8 (diff)
update translations for master
and force-fix errors using pocheck Change-Id: I9bbea708cab941400c98f6a83b67215bb19469fa
Diffstat (limited to 'source/zh-CN/helpcontent2')
-rw-r--r--source/zh-CN/helpcontent2/source/text/sbasic/shared.po820
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/00.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/01.po96
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/guide.po34
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/00.po32
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/01.po347
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/explorer/database.po147
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/guide.po39
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/optionen.po52
-rw-r--r--source/zh-CN/helpcontent2/source/text/simpress/guide.po26
-rw-r--r--source/zh-CN/helpcontent2/source/text/smath/01.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter.po11
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/00.po24
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/01.po14
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/guide.po20
15 files changed, 886 insertions, 788 deletions
diff --git a/source/zh-CN/helpcontent2/source/text/sbasic/shared.po b/source/zh-CN/helpcontent2/source/text/sbasic/shared.po
index a42810835e5..8fc817d05a7 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-04-15 12:52+0200\n"
+"POT-Creation-Date: 2020-04-29 22:17+0200\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"
@@ -9223,14 +9223,14 @@ msgctxt ""
msgid "<link href=\"text/sbasic/shared/03010305.xhp\" name=\"RGB Function\">RGB Function</link>"
msgstr "<link href=\"text/sbasic/shared/03010305.xhp\" name=\"RGB Function\">RGB 函数</link>"
-#. 7ME9i
+#. iRBsy
#: 03010305.xhp
msgctxt ""
"03010305.xhp\n"
"par_id3150447\n"
"help.text"
-msgid "Returns a <link href=\"text/sbasic/shared/00000003.xhp#farbcodes\" name=\"long integer color value\">long integer color value</link> consisting of red, green, and blue components."
-msgstr "返回由红色、绿色和蓝色成分组成的<link href=\"text/sbasic/shared/00000003.xhp#farbcodes\" name=\"长整型颜色值\">长整型颜色值</link>。"
+msgid "Returns a <literal>Long</literal> integer color value consisting of red, green, and blue components."
+msgstr ""
#. MiCPe
#: 03010305.xhp
@@ -9304,6 +9304,15 @@ msgctxt ""
msgid "<emph>Blue</emph>: Any integer expression that represents the blue component (0-255) of the composite color."
msgstr "「<emph>Blue</emph>」: 表示颜色中蓝色成分 (0-255) 的任意整数表达式。"
+#. dFrtY
+#: 03010305.xhp
+msgctxt ""
+"03010305.xhp\n"
+"par_id211587653651037\n"
+"help.text"
+msgid "The <link href=\"text/shared/optionen.xhp/01010501.xhp\" name=\"color picker dialog\">color picker dialog</link> helps computing red, green and blue components of a composite color. <link href=\"text/shared/guide/text_color.xhp\" name=\"Changing the color of text\">Changing the color of text</link> and selecting <emph>Custom color</emph> displays the color picker dialog."
+msgstr ""
+
#. Vn6Jr
#: 03010305.xhp
msgctxt ""
@@ -13885,14 +13894,14 @@ msgctxt ""
msgid "<bookmark_value>WeekDay function</bookmark_value>"
msgstr "<bookmark_value>WeekDay 函数</bookmark_value>"
-#. qnjFp
+#. QNFTv
#: 03030105.xhp
msgctxt ""
"03030105.xhp\n"
"hd_id3153127\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03030105.xhp\" name=\"WeekDay Function\">WeekDay Function</link>"
-msgstr "<link href=\"text/sbasic/shared/03030105.xhp\" name=\"WeekDay Function\">WeekDay 函数</link>"
+msgid "<link href=\"text/sbasic/shared/03030105.xhp\" name=\"WeekDay Function\">WeekDay Function (BASIC)</link>"
+msgstr ""
#. UpMwa
#: 03030105.xhp
@@ -13903,15 +13912,6 @@ msgctxt ""
msgid "Returns the number corresponding to the weekday represented by a serial date number that is generated by the DateSerial or the DateValue function."
msgstr "返回与由 DateSerial 或 DateValue 函数生成的工作日 (以顺序日期数表示) 相对应的数字。"
-#. MDM2Q
-#: 03030105.xhp
-msgctxt ""
-"03030105.xhp\n"
-"hd_id3145068\n"
-"help.text"
-msgid "Syntax:"
-msgstr "语法:"
-
#. ExFvM
#: 03030105.xhp
msgctxt ""
@@ -13921,15 +13921,6 @@ msgctxt ""
msgid "WeekDay (Number)"
msgstr "WeekDay (Number)"
-#. WqJFm
-#: 03030105.xhp
-msgctxt ""
-"03030105.xhp\n"
-"hd_id3148799\n"
-"help.text"
-msgid "Return value:"
-msgstr "返回值:"
-
#. CPXVo
#: 03030105.xhp
msgctxt ""
@@ -13939,15 +13930,6 @@ msgctxt ""
msgid "Integer"
msgstr "整数"
-#. rd8BW
-#: 03030105.xhp
-msgctxt ""
-"03030105.xhp\n"
-"hd_id3150768\n"
-"help.text"
-msgid "Parameters:"
-msgstr "参数:"
-
#. tC2Mw
#: 03030105.xhp
msgctxt ""
@@ -13966,15 +13948,6 @@ msgctxt ""
msgid "The following example determines the day of the week using the WeekDay function when you enter a date."
msgstr "以下示例使用 WeekDay 函数确定输入的日期是星期几。"
-#. hgfzk
-#: 03030105.xhp
-msgctxt ""
-"03030105.xhp\n"
-"hd_id3148616\n"
-"help.text"
-msgid "Example:"
-msgstr "示例:"
-
#. bR8LQ
#: 03030105.xhp
msgctxt ""
@@ -25441,6 +25414,15 @@ msgctxt ""
msgid "A Type structure is an ordered collection of data fields, that can be manipulated as a single item."
msgstr ""
+#. WfsVY
+#: 03090413.xhp
+msgctxt ""
+"03090413.xhp\n"
+"par_id491585753339474\n"
+"help.text"
+msgid "<image src=\"media/helpimg/sbasic/Type_statement.svg\" id=\"img_id4156296484514\"><alt id=\"alt_id15152796484514\">Type statement diagram</alt></image>"
+msgstr ""
+
#. TTALN
#: 03090413.xhp
msgctxt ""
@@ -27628,122 +27610,122 @@ msgctxt ""
msgid "<link href=\"text/sbasic/shared/03102100.xhp\" name=\"Dim Statement\">Dim Statement</link>"
msgstr "<link href=\"text/sbasic/shared/03102100.xhp\" name=\"Dim Statement\">Dim 语句</link>"
-#. bm7E7
+#. 9gRSS
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
"par_id3143271\n"
"help.text"
-msgid "Declares a variable or an array."
-msgstr "声明变量或数组。"
+msgid "Declares variables or arrays."
+msgstr ""
-#. QpjCG
+#. vWsXg
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
"par_id3154686\n"
"help.text"
-msgid "If the variables are separated by commas (for example, DIM sPar1, sPar2, sPar3 AS STRING), only Variant variables can be defined. Use a separate definition line for each variable."
-msgstr "如果变量之间用逗号分隔 (例如,DIM sPar1, sPar2, sPar3 AS STRING),则只能定义为变体变量。请对每个变量使用单独的定义行。"
+msgid "If the variables are separated by commas - for example <literal>Dim sPar1, sPar2, sPar3 As String</literal> - first ones get defined as Variant variables. A new line, or colon sign (<emph>:</emph>), help separate variable definitions."
+msgstr ""
-#. pGPXy
+#. sZ9H8
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
"par_id3152576\n"
"help.text"
-msgid "Dim declares local variables within subroutines. Global variables are declared with the PUBLIC or the PRIVATE statement."
-msgstr "Dim 只能声明子例程中的局部变量。要声明全局变量,需要使用 PUBLIC 或 PRIVATE 语句。"
+msgid "<literal>Dim</literal> declares local variables within subroutines. Global variables are declared with the <literal>Global</literal>, <literal>Public</literal> or the <literal>Private</literal> statement."
+msgstr ""
-#. BZADe
+#. RWfkr
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"hd_id3156443\n"
+"par_id971587473488701\n"
"help.text"
-msgid "Syntax:"
-msgstr "语法:"
+msgid "<image src=\"media/helpimg/sbasic/Dim_statement.svg\" id=\"img_id4156296484514\"><alt id=\"alt_id15152796484514\">Dim Statement diagram</alt></image>"
+msgstr ""
-#. gcgux
+#. yKMdt
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
"par_id3149412\n"
"help.text"
-msgid "[ReDim]Dim VarName [(start To end)] [As VarType][, VarName2 [(start To end)] [As VarType][,...]]"
-msgstr "[ReDim]Dim VarName [(start To end)] [As VarType][, VarName2 [(start To end)] [As VarType][,...]]"
+msgid "Dim variable [(start To end)] [As type-name][, variable2[type-char] [(start To end)] [,...]]"
+msgstr ""
-#. DF2ha
+#. JBuCh
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"hd_id3147397\n"
+"par_id3154730\n"
"help.text"
-msgid "Parameters:"
-msgstr "参数:"
+msgid "<emph>variable:</emph> Any variable or array name."
+msgstr ""
-#. qPBJU
+#. BaEsN
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3154730\n"
+"par_id3147125\n"
"help.text"
-msgid "<emph>VarName:</emph> Any variable or array name."
-msgstr "「<emph>VarName</emph>」: 任意变量或数组的名称。"
+msgid "<emph>start, end:</emph> Numerical values or constants that define the number of elements (NumberElements=(end-start)+1) and the index range."
+msgstr ""
-#. PPY3B
+#. T2g5D
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3147125\n"
+"par_id3153877\n"
"help.text"
-msgid "<emph>Start, End:</emph> Numerical values or constants that define the number of elements (NumberElements=(end-start)+1) and the index range."
-msgstr "「<emph>Start、End</emph>」: 用于定义元素数量 (NumberElements=(end-start)+1) 和索引范围的数值或常数。"
+msgid "<emph>start</emph> and <emph>end</emph> can be numerical expressions if <literal>ReDim</literal> is applied at the procedure level."
+msgstr ""
-#. 3GDzQ
+#. upQJe
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3153877\n"
+"par_id3154510\n"
"help.text"
-msgid "Start and End can be numerical expressions if ReDim is applied at the procedure level."
-msgstr "如果对过程级别采用 ReDim,则 start 和 end 可以是数字表达式。"
+msgid "<emph>type-name:</emph> Keyword that declares the data type of a variable."
+msgstr ""
-#. oTp9v
+#. HDgeB
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3153510\n"
+"par_id971587473508701\n"
"help.text"
-msgid "<emph>VarType:</emph> Key word that declares the data type of a variable."
-msgstr "「<emph>VarType</emph>」: 用于声明变量的数据类型的关键字。"
+msgid "<image src=\"media/helpimg/sbasic/type-name_fragment.svg\" id=\"img_id4156296484515\"><alt id=\"alt_id15152796484515\">primitive data types fragment</alt></image>"
+msgstr ""
-#. ESbgw
+#. pFWdb
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3154015\n"
+"par_id21587557790810\n"
"help.text"
-msgid "<emph>Keyword:</emph> Variable type"
-msgstr "「<emph>Keyword</emph>」: 变量类型"
+msgid "<emph>Byte:</emph> Byte variable (0-255)"
+msgstr ""
-#. ybpn5
+#. fQsgi
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
"par_id3153949\n"
"help.text"
-msgid "<emph>Bool:</emph> Boolean variable (True, False)"
-msgstr "「<emph>Bool</emph>」: 布尔变量 (True、False)"
+msgid "<emph>Boolean:</emph> Boolean variable (True, False)"
+msgstr ""
-#. hB7hK
+#. PouUE
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
"par_id3156275\n"
"help.text"
-msgid "<emph>Currency:</emph> Currency-Variable (Currency with 4 Decimal places)"
-msgstr "「<emph>Currency</emph>」: 货币变量 (含有 4 位小数的货币)"
+msgid "<emph>Currency:</emph> Currency variable (Currency with 4 Decimal places)"
+msgstr ""
#. BHPpy
#: 03102100.xhp
@@ -27754,14 +27736,14 @@ msgctxt ""
msgid "<emph>Date:</emph> Date variable"
msgstr "「<emph>Date</emph>」: 日期变量"
-#. D43GE
+#. jyVtV
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
"par_id3148405\n"
"help.text"
-msgid "<emph>Double:</emph> Double-precision floating-point variable (1,79769313486232 x 10E308 - 4,94065645841247 x 10E-324)"
-msgstr "「<emph>Double</emph>」: 双精度的浮点变量 (1.79769313486232 x 10E308 到 4.94065645841247 x 10E-324)"
+msgid "<emph>Double:</emph> Double-precision floating-point variable (1,79769313486232 x 10E308 - 4,94065645841247 x 10E-324)"
+msgstr ""
#. kBUDz
#: 03102100.xhp
@@ -27781,14 +27763,14 @@ msgctxt ""
msgid "<emph>Long:</emph> Long integer variable (-2.147.483.648 - 2.147.483.647)"
msgstr "「<emph>Long</emph>」: 长整数变量 (-2,147,483,648 到 2,147,483,647)"
-#. gFGxF
+#. z9CEA
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
"par_id3149255\n"
"help.text"
-msgid "<emph>Object:</emph> Object variable (Note: this variable can only subsequently be defined with Set!)"
-msgstr "「<emph>Object</emph>」:对象变量 (注: 随后只能使用 Set 定义此变量!)"
+msgid "<emph>Object:</emph> Object variable (Note: this variable can only subsequently be defined with <literal>Set</literal>!)"
+msgstr ""
#. iBZ3a
#: 03102100.xhp
@@ -27808,122 +27790,149 @@ msgctxt ""
msgid "<emph>String:</emph> String variable consisting of a maximum of 64,000 ASCII characters."
msgstr "「<emph>String</emph>」:字符串变量,最多可以含有 64,000 个 ASCII 字符。"
-#. j63Bt
+#. UkswY
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
"par_id3154704\n"
"help.text"
-msgid "<emph>[Variant]:</emph> Variant variable type (contains all types, specified by definition). If a key word is not specified, variables are automatically defined as Variant Type, unless a statement from DefBool to DefVar is used."
-msgstr "「<emph>[Variant]</emph>」: 变体变量类型 (含有所有类型,由定义指定)。如果未指定关键字,也未使用从 DefBool 到 DefVar 的语句,变量将自动定义为变体类型。"
+msgid "<emph>Variant:</emph> Variant variable type (contains all types, specified by definition). If a type name is not specified, variables are automatically defined as Variant Type, unless a statement from <literal>DefBool</literal> to <literal>DefVar</literal> is used."
+msgstr ""
-#. cyiCt
+#. DPnaK
+#: 03102100.xhp
+msgctxt ""
+"03102100.xhp\n"
+"par_id3153510\n"
+"help.text"
+msgid "<emph>type-char:</emph> Special character that declares the data type of a variable."
+msgstr ""
+
+#. bCFDG
+#: 03102100.xhp
+msgctxt ""
+"03102100.xhp\n"
+"par_id971587473518701\n"
+"help.text"
+msgid "<image src=\"media/helpimg/sbasic/type-car_fragment.svg\" id=\"img_id4156296484516\"><alt id=\"alt_id15152796484516\">Type declaration characters fragment</alt></image>"
+msgstr ""
+
+#. JgnAC
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
"par_id3146316\n"
"help.text"
-msgid "In $[officename] Basic, you do not need to declare variables explicitly. However, you need to declare an array before you can use them. You can declare a variable with the Dim statement, using commas to separate multiple declarations. To declare a variable type, enter a type-declaration character following the name or use a corresponding key word."
-msgstr "在 $[officename] Basic 中,您不需要显式声明变量。但是在使用数组之前必须先声明数组。您可以使用 Dim 语句声明变量,多个变量声明需要用逗号分隔。要声明变量类型,请在名称后输入类型声明字符,或者使用相应的关键字。"
+msgid "In %PRODUCTNAME Basic, you do not need to declare variables explicitly. However, you need to declare arrays before you can use them. You can declare a variable with the <literal>Dim</literal> statement, using commas (<emph>,</emph>) to separate multiple declarations. To declare a variable type, enter a type-declaration character following the name or use a corresponding type keyword name."
+msgstr ""
-#. JkDDD
+#. XodQr
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3149924\n"
+"par_id411587558178871\n"
"help.text"
-msgid "$[officename] Basic supports single or multi-dimensional arrays that are defined by a specified variable type. Arrays are suitable if the program contains lists or tables that you want to edit. The advantage of arrays is that it is possible to address individual elements according to indexes, which can be formulated as numeric expressions or variables."
-msgstr "$[officename] Basic 支持用指定的变量类型定义的一维和多维数组。如果要在程序中编辑列表或表格,则使用数组是最合适的,因为可以通过索引定位数组中的各个元素,而索引可以用数字表达式或变量来表述。"
+msgid "Declaration character"
+msgstr ""
-#. y72jG
+#. 6ZFgR
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3148488\n"
+"par_id851587558178871\n"
+"help.text"
+msgid "Variable type name"
+msgstr ""
+
+#. VDkAN
+#: 03102100.xhp
+msgctxt ""
+"03102100.xhp\n"
+"par_id441587477911298\n"
"help.text"
-msgid "Arrays are declared with the Dim statement. There are two methods to define the index range:"
-msgstr "数组使用 Dim 语句进行声明。定义索引范围的方法有两种:"
+msgid "<emph>array:</emph> Array declaration."
+msgstr ""
-#. hHahF
+#. TmrKG
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3154662\n"
+"par_id971587473519701\n"
"help.text"
-msgid "DIM text(20) as String REM 21 elements numbered from 0 to 20"
-msgstr "DIM text(20) as String REM 编号为 0 到 20 的 21 个元素"
+msgid "<image src=\"media/helpimg/sbasic/array_fragment.svg\" id=\"img_id4156296485516\"><alt id=\"alt_id15152796485516\">array fragment</alt></image>"
+msgstr ""
-#. Hi7Nv
+#. JkDDD
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3155604\n"
+"par_id3149924\n"
"help.text"
-msgid "DIM text(5 to 25) as String REM 21 elements numbered from 5 to 25"
-msgstr "DIM text(5 to 25) as String REM 编号为 5 到 25 的 21 个元素"
+msgid "$[officename] Basic supports single or multi-dimensional arrays that are defined by a specified variable type. Arrays are suitable if the program contains lists or tables that you want to edit. The advantage of arrays is that it is possible to address individual elements according to indexes, which can be formulated as numeric expressions or variables."
+msgstr "$[officename] Basic 支持用指定的变量类型定义的一维和多维数组。如果要在程序中编辑列表或表格,则使用数组是最合适的,因为可以通过索引定位数组中的各个元素,而索引可以用数字表达式或变量来表述。"
-#. Y9rBz
+#. ZuZBj
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3151274\n"
+"par_id3148488\n"
"help.text"
-msgid "DIM text(-15 to 5) as String REM 21 elements (including 0)"
-msgstr "DIM text(-15 to 5) as String REM 21 个元素 (包括 0)"
+msgid "Arrays are declared with the <literal>Dim</literal> statement. There are multiple ways to define the index range:"
+msgstr ""
-#. rgjVA
+#. iXgDy
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3152774\n"
+"bas_id381587475057846\n"
"help.text"
-msgid "REM numbered from -15 to 5"
-msgstr "REM 编号为 -15 到 5"
+msgid "Dim text(20) As String ' 21 elements numbered from 0 to 20"
+msgstr ""
-#. tZwqq
+#. Du5a3
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3150829\n"
+"bas_id1001587475058292\n"
"help.text"
-msgid "Two-dimensional data field"
-msgstr "二维数据字段"
+msgid "Dim value(5 to 25) As Integer ' 21 values numbered from 5 to 25"
+msgstr ""
-#. LF3Qa
+#. 66C57
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3149529\n"
+"bas_id481587475059423\n"
"help.text"
-msgid "DIM text(20,2) as String REM 63 elements; form 0 to 20 level 1, from 0 to 20 level 2 and from 0 to 20 level 3."
-msgstr "DIM text(20,2) as String REM 63 个元素: 级别 1 的 0 到 20;级别 2 的 0 到 20;级别 3 的 0 到 20。"
+msgid "Dim amount(-15 to 5) As Currency ' 21 amounts (including 0), numbered from -15 to 5"
+msgstr ""
-#. J3Lir
+#. Q6d4T
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3159239\n"
+"bas_id621587475059824\n"
"help.text"
-msgid "You can declare an array types as dynamic if a ReDim statement defines the number of dimensions in the subroutine or the function that contains the array. Generally, you can only define an array dimension once, and you cannot modify it. Within a subroutine, you can declare an array with ReDim. You can only define dimensions with numeric expressions. This ensures that the fields are only as large as necessary."
-msgstr "如果使用 ReDim 语句在含有某个数组的子例行程序或函数中定义了维数,则可以将该数组的类型声明为动态。通常,您只能定义一次数组维数,并且定义之后不能修改。在子例行程序中,您可以使用 ReDim 声明数组。只能使用数字表达式来定义维数,这样可以确保字段为所需的大小。"
+msgid "REM Two-dimensional data field"
+msgstr ""
-#. EDdP3
+#. 9gAsN
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"hd_id3150344\n"
+"bas_id11587475060830\n"
"help.text"
-msgid "Example:"
-msgstr "示例:"
+msgid "Dim table$(20,2) ' 63 items; from 0 to 20 level 1, from 0 to 20 level 2 and from 0 to 20 level 3."
+msgstr ""
-#. cgxpk
+#. FLoRP
#: 03102100.xhp
msgctxt ""
"03102100.xhp\n"
-"par_id3154657\n"
+"par_id3159239\n"
"help.text"
-msgid "sVar = \"Office\""
-msgstr "sVar = \"Office\""
+msgid "You can declare an array types as dynamic if a <literal>ReDim</literal> statement defines the number of dimensions in the subroutine or the function that contains the array. Generally, you can only define an array dimension once, and you cannot modify it. Within a subroutine, you can declare an array with <literal>ReDim</literal>. You can only define dimensions with numeric expressions. This ensures that the fields are only as large as necessary."
+msgstr ""
#. cGpY9
#: 03102100.xhp
@@ -27970,248 +27979,41 @@ msgctxt ""
msgid "<link href=\"text/sbasic/shared/03102101.xhp\" name=\"ReDim Statement\">ReDim Statement</link>"
msgstr "<link href=\"text/sbasic/shared/03102101.xhp\" name=\"ReDim Statement\">ReDim 语句</link>"
-#. AwErM
+#. F9HMw
#: 03102101.xhp
msgctxt ""
"03102101.xhp\n"
"par_id3154685\n"
"help.text"
-msgid "Declares a variable or an array."
-msgstr "声明变量或数组。"
+msgid "Declares or redefines variables or arrays."
+msgstr ""
-#. fZ9yj
+#. dTArZ
#: 03102101.xhp
msgctxt ""
"03102101.xhp\n"
-"hd_id3154218\n"
+"par_id971587473488701\n"
"help.text"
-msgid "Syntax:"
-msgstr "语法:"
+msgid "<image src=\"media/helpimg/sbasic/ReDim_statement.svg\" id=\"img_id4156296484514\"><alt id=\"alt_id15152796484514\">ReDim Statement diagram</alt></image>"
+msgstr ""
-#. dGFJk
+#. bD6eG
#: 03102101.xhp
msgctxt ""
"03102101.xhp\n"
"par_id3156214\n"
"help.text"
-msgid "[ReDim]Dim VarName [(start To end)] [As VarType][, VarName2 [(start To end)] [As VarType][,...]]"
-msgstr "[ReDim]Dim VarName [(start To end)] [As VarType][, VarName2 [(start To end)] [As VarType][,...]]"
+msgid "ReDim [Preserve] variable [(start To end)] [As type-name][, variable2 [(start To end)] [As type-name][,...]]"
+msgstr ""
-#. HCVxq
+#. 5wDoD
#: 03102101.xhp
msgctxt ""
"03102101.xhp\n"
"par_id711996\n"
"help.text"
-msgid "Optionally, you can add the <emph>Preserve</emph> keyword as a parameter to preserve the contents of the array that is redimensioned."
-msgstr "您还可以添加「<emph>保留</emph>」关键字作为参数,保留重新设置维数的矩阵内容。"
-
-#. KeaqP
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"hd_id3148451\n"
-"help.text"
-msgid "Parameters:"
-msgstr "参数:"
-
-#. 5VjHG
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3156423\n"
-"help.text"
-msgid "<emph>VarName:</emph> Any variable or array name."
-msgstr "「<emph>VarName</emph>」: 任意变量或数组的名称。"
-
-#. 4gHFh
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3149562\n"
-"help.text"
-msgid "<emph>Start, End:</emph> Numerical values or constants that define the number of elements (NumberElements=(end-start)+1) and the index range."
-msgstr "「<emph>Start、End</emph>」: 用于定义元素数量 (NumberElements=(end-start)+1) 和索引范围的数值或常数。"
-
-#. vP6dA
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3155307\n"
-"help.text"
-msgid "Start and End can be numeric expressions if ReDim is used at the procedure level."
-msgstr "如果在过程级别采用 ReDim,则 start 和 end 可以是数字表达式。"
-
-#. A3MnD
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3153951\n"
-"help.text"
-msgid "<emph>VarType:</emph> Keyword that declares the data type of a variable."
-msgstr "「<emph>VarType</emph>」: 用于声明变量数据类型的关键字。"
-
-#. 43NDu
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3147317\n"
-"help.text"
-msgid "<emph>Keyword:</emph> Variable type"
-msgstr "「<emph>Keyword</emph>」: 变量类型"
-
-#. hrAde
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3153728\n"
-"help.text"
-msgid "<emph>Bool: </emph>Boolean variable (True, False)"
-msgstr "「<emph>Bool</emph>」: 布尔变量 (True、False)"
-
-#. VCYQt
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3146121\n"
-"help.text"
-msgid "<emph>Date:</emph> Date variable"
-msgstr "「<emph>Date</emph>」: 日期变量"
-
-#. LCL7Q
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3159156\n"
-"help.text"
-msgid "<emph>Double:</emph> Double floating point variable (1.79769313486232x10E308 - 4.94065645841247x10E-324)"
-msgstr "「<emph>Double</emph>」: 双精度的浮点变量 (1.79769313486232 x 10E308 到 4.94065645841247 x 10E-324)"
-
-#. wzD36
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3148616\n"
-"help.text"
-msgid "<emph>Integer:</emph> Integer variable (-32768 - 32767)"
-msgstr "「<emph>Integer</emph>」: 整数变量 (-32768 到 32767)"
-
-#. ZSesV
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3147348\n"
-"help.text"
-msgid "<emph>Long:</emph> Long integer variable (-2,147,483,648 - 2,147,483,647)"
-msgstr "「<emph>Long</emph>」: 长整型变量 (-2、147、483、648 到 2、147、483、647)"
-
-#. 6EtG6
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3149412\n"
-"help.text"
-msgid "<emph>Object:</emph> Object variable (can only be subsequently defined by Set!)"
-msgstr "「<emph>Object</emph>」:对象变量 (随后就只能使用 Set 来定义此变量!)"
-
-#. EM7eN
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3154729\n"
-"help.text"
-msgid "<emph>[Single]:</emph> Single floating-point variable (3.402823x10E38 - 1.401298x10E-45). If no key word is specified, a variable is defined as Single, unless a statement from DefBool to DefVar is used."
-msgstr "「<emph>[Single]</emph>」: 单精度的浮点变量 (3.402823 x 10E38 到 1.401298 x 10E-45) 如果不指定关键字,也未使用 DefBool、DefVar 等语句,则变量将被定义为单精度类型。"
-
-#. LLYEo
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3148458\n"
-"help.text"
-msgid "<emph>String:</emph> String variable containing a maximum of 64,000 ASCII characters."
-msgstr "「<emph>String</emph>」:字符串变量,最多可以含有 64,000 个 ASCII 字符。"
-
-#. VhzLs
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3149581\n"
-"help.text"
-msgid "<emph>Variant: </emph>Variant variable type (can contain all types and is set by definition)."
-msgstr "「<emph>Variant</emph>」: 变体变量类型 (含有所有类型,由定义指定)。"
-
-#. yxCux
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3155601\n"
-"help.text"
-msgid "In $[officename] Basic, you do not need to declare variables explicitly. However, you need to declare an array before you can use them. You can declare a variable with the Dim statement, using commas to separate multiple declarations. To declare a variable type, enter a type-declaration character following the name or use a corresponding key word."
-msgstr "在 $[officename] Basic 中,您不需要显式声明变量。但是在使用数组之前必须先声明数组。您可以使用 Dim 语句声明变量,多个变量声明需要用逗号分隔。要声明变量类型,请在名称后输入类型声明字符,或者使用相应的关键字。"
-
-#. bBe4t
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3153415\n"
-"help.text"
-msgid "$[officename] Basic supports single or multi-dimensional arrays that are defined by a specified variable type. Arrays are suitable if the program contains lists or tables that you want to edit. The advantage of arrays is that it is possible to address individual elements according to indexes, which can be formulated as numeric expressions or variables."
-msgstr "$[officename] Basic 支持用指定的变量类型定义的一维和多维数组。如果要在程序中编辑列表或表格,则使用数组是最合适的,因为可以通过索引定位数组中的各个元素,而索引可以用数字表达式或变量来表述。"
-
-#. zMCfu
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3146971\n"
-"help.text"
-msgid "There are two ways to set the range of indices for arrays declared with the Dim statement:"
-msgstr "在使用 Dim 语句声明数组时,有两种方法可以设置数组索引的范围:"
-
-#. GC3Bz
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3153950\n"
-"help.text"
-msgid "DIM text(20) As String REM 21 elements numbered from 0 to 20"
-msgstr "DIM text(20) As String REM 编号从 0 到 20 的 21 个元素"
-
-#. MYHME
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3146912\n"
-"help.text"
-msgid "DIM text(5 to 25) As String REM 21 elements numbered from 5 to 25"
-msgstr "DIM text(5 to 25) As String REM 编号为 5 到 25 的 21 个元素"
-
-#. Ynkyg
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3153709\n"
-"help.text"
-msgid "DIM text$(-15 to 5) As String REM 21 elements (0 inclusive),"
-msgstr "DIM text$(-15 to 5) As String REM 21 个元素 (包括 0),"
-
-#. YCEPk
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3150321\n"
-"help.text"
-msgid "rem numbered from -15 to 5"
-msgstr "rem 编号为 -15 到 5"
-
-#. AvMQE
-#: 03102101.xhp
-msgctxt ""
-"03102101.xhp\n"
-"par_id3149018\n"
-"help.text"
-msgid "Variable fields, regardless of type, can be made dynamic if they are dimensioned by ReDim at the procedure level in subroutines or functions. Normally, you can only set the range of an array once and you cannot modify it. Within a procedure, you can declare an array using the ReDim statement with numeric expressions to define the range of the field sizes."
-msgstr "如果在过程级别的子例程或函数中通过 ReDim 确定了变量字段的大小,则无论具有何种类型,这些变量字段均可以成为动态字段。通常只能设置一次数组范围,并且设置之后不能修改。在此过程中,您可以使用 ReDim 语句通过数字表达式来声明一个数组,从而定义字段大小的范围。"
+msgid "Optionally, add the <literal>Preserve</literal> keyword to preserve the contents of the array that is redimensioned. <literal>ReDim</literal> can only be used in subroutines."
+msgstr ""
#. TTGyB
#: 03102101.xhp
@@ -29860,6 +29662,15 @@ msgctxt ""
msgid "Boolean variable"
msgstr "布尔变量"
+#. zrorE
+#: 03103600.xhp
+msgctxt ""
+"03103600.xhp\n"
+"par_id3158645\n"
+"help.text"
+msgid "Byte variable"
+msgstr ""
+
#. N3udA
#: 03103600.xhp
msgctxt ""
@@ -39751,13 +39562,22 @@ msgctxt ""
msgid "<variable id=\"ErrVBAh1\"><link href=\"text/sbasic/shared/ErrVBA.xhp\" name=\"Err object [VBA]\">Err Object [VBA]</link></variable>"
msgstr ""
-#. KxDJt
+#. RZpQL
#: ErrVBA.xhp
msgctxt ""
"ErrVBA.xhp\n"
"N0012\n"
"help.text"
-msgid "Use VBA <literal>Err</literal> object to raise or handle runtime errors. <literal>Err</literal> is a VBA built-in global object which permits:"
+msgid "Use VBA <literal>Err</literal> object to raise or handle runtime errors."
+msgstr ""
+
+#. D7JiE
+#: ErrVBA.xhp
+msgctxt ""
+"ErrVBA.xhp\n"
+"N0012b\n"
+"help.text"
+msgid "<literal>Err</literal> is a built-in VBA global object that allows:"
msgstr ""
#. VpE8g
@@ -39814,13 +39634,13 @@ msgctxt ""
msgid "Properties"
msgstr ""
-#. UG8Cx
+#. FSwVh
#: ErrVBA.xhp
msgctxt ""
"ErrVBA.xhp\n"
"N0020\n"
"help.text"
-msgid "<emph>Description</emph> property gives the nature of the error. It details the various reasons that may cause the error. Ideally it provides the multiple course of actions that help solve the issue and prevent its reoccurrence. Its alias is Basic <link href=\"text/sbasic/shared/03050300.xhp\" name=\"Error function\">Error</link> function for %PRODUCTNAME predefined errors."
+msgid "<emph>Description</emph> property gives the nature of the error. It details the various reasons that may cause the error. Ideally, it provides the multiple course of actions to help solve the issue and prevent its reoccurrence. Its alias is Basic <link href=\"text/sbasic/shared/03050300.xhp\" name=\"Error function\">Error</link> function for %PRODUCTNAME predefined errors."
msgstr ""
#. PjWUG
@@ -40129,31 +39949,31 @@ msgctxt ""
msgid "<image src=\"media/helpimg/sbasic/Resume_statement.svg\" id=\"img_id4156296484514\"><alt id=\"alt_id15152796484514\">Resume Statement diagram</alt></image>"
msgstr ""
-#. KAJEM
+#. eafvm
#: Resume.xhp
msgctxt ""
"Resume.xhp\n"
"par_id481586090298901\n"
"help.text"
-msgid "<emph>0: </emph>Resets error information and re-executes the instruction that caused the error. <emph>0</emph> is optional."
+msgid "<literal>0</literal>: Resets error information and re-executes the instruction that caused the error. <literal>0</literal> is optional."
msgstr ""
-#. RTTux
+#. uukh4
#: Resume.xhp
msgctxt ""
"Resume.xhp\n"
"par_id331586090532804\n"
"help.text"
-msgid "<emph>label: </emph>Resets error information and executes the instruction at the given label."
+msgid "<emph>label: </emph>: Resets error information and resumes execution at the specified label of the current subroutine."
msgstr ""
-#. 7RP8z
+#. 7NaeS
#: Resume.xhp
msgctxt ""
"Resume.xhp\n"
"par_id331586090432804\n"
"help.text"
-msgid "<emph>Next: </emph>Resets error information and executes the instruction following the one that caused the error."
+msgid "<literal>Next</literal>: Resets error information and executes the instruction following the one that caused the error."
msgstr ""
#. 3Jge7
@@ -40255,13 +40075,13 @@ msgctxt ""
msgid "Use <literal>Resume Next</literal>, for example, when reporting anomalies encountered for an iterating process that must not be interrupted. In which case multiple handling routines may be required."
msgstr ""
-#. AeVfB
+#. 4NKFt
#: Resume.xhp
msgctxt ""
"Resume.xhp\n"
"par_id461586091018138\n"
"help.text"
-msgid "Using <literal>Resume</literal> without parameters to re-execute the faulty instruction can fit certain situations. However that may cause a never ending loop."
+msgid "Using <literal>Resume</literal> without parameters to re-execute the faulty instruction can fit certain situations. However that may cause a neverending loop."
msgstr ""
#. MqMrx
@@ -40849,6 +40669,231 @@ msgctxt ""
msgid "<link href=\"text/sbasic/shared/03090411.xhp\" name=\"With\">With</link> statement"
msgstr "<link href=\"text/sbasic/shared/03090411.xhp\" name=\"With\">With</link> 语句"
+#. FFWQn
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"tit\n"
+"help.text"
+msgid "Basic syntax diagrams fragments"
+msgstr ""
+
+#. y2yz2
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"hd_id541587044867073\n"
+"help.text"
+msgid "<variable id=\"fragmentsh1\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"Syntax fragments\">Syntax fragments</link></variable>"
+msgstr ""
+
+#. qdgmB
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id881587044839050\n"
+"help.text"
+msgid "%PRODUCTNAME Basic syntax fragments."
+msgstr ""
+
+#. ChERt
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"hd_id431587045941514\n"
+"help.text"
+msgid "<variable id=\"argumenth2\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"arguments in Function, Sub and Property statements\"/></variable>argument fragment"
+msgstr ""
+
+#. pfHq8
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id491585753339474\n"
+"help.text"
+msgid "<image src=\"media/helpimg/sbasic/argument_fragment.svg\" id=\"img_id4156296484514\"><alt id=\"alt_id15152796484514\">argument fragment</alt></image>"
+msgstr ""
+
+#. zqKwG
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"hd_id811587303969210\n"
+"help.text"
+msgid "Parameters"
+msgstr ""
+
+#. E7GXy
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id481586090298901\n"
+"help.text"
+msgid "<literal>Optional</literal>: The argument is not mandatory."
+msgstr ""
+
+#. FEs39
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id331586090532804\n"
+"help.text"
+msgid "<literal>ByRef</literal>: The argument is passed by reference. <literal>ByRef</literal> is the default."
+msgstr ""
+
+#. WuCPC
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id331586090432804\n"
+"help.text"
+msgid "<literal>ByVal</literal>: The argument is passed by value. Its value can be modified by the called routine."
+msgstr ""
+
+#. GrfMS
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id651587044335713\n"
+"help.text"
+msgid "<emph>char:</emph> Type declaration character."
+msgstr ""
+
+#. Naxwg
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id651587044336713\n"
+"help.text"
+msgid "<emph>typename</emph>: Primitive data type name. Library or module defined types can also be specified."
+msgstr ""
+
+#. KwsyR
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id11587045141290\n"
+"help.text"
+msgid "<emph>= expression</emph>: Specify a default value for the argument, matching its declared type. <literal>Optional</literal> is necessary for each argument specifying a default value."
+msgstr ""
+
+#. 4Atx8
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id331586091432804\n"
+"help.text"
+msgid "<literal>ParamArray</literal>: Use <literal>ParamArray</literal> when the number of parameters is undetermined. A typical scenario is that of a Calc user-defined function. Using <literal>ParamArray</literal> should be limited to the last argument of a routine."
+msgstr ""
+
+#. GWSD4
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id851587050837107\n"
+"help.text"
+msgid "Using<literal>ParamArray</literal> or <emph>= expression</emph> require <link href=\"text/sbasic/shared/compatible.xhp\" name=\"Option Compatible\">Option Compatible</link> to be placed before the executable program code in a module."
+msgstr ""
+
+#. EDCLX
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id391587571321063\n"
+"help.text"
+msgid "When using <link href=\"text/sbasic/shared/vbasupport.xhp\" name=\"Option VBASupport\">Option VBASupport 1</link>, <literal>Optional</literal> arguments with no default value (<emph>= expression</emph>) are initialized according to their data type, except if <literal>Variant</literal>."
+msgstr ""
+
+#. KG4tC
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"hd_id231587046013456\n"
+"help.text"
+msgid "<variable id=\"arrayh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"array syntax fragment\"/></variable>array fragment"
+msgstr ""
+
+#. YD32W
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id491586753339473\n"
+"help.text"
+msgid "<image src=\"media/helpimg/sbasic/array_fragment.svg\" id=\"img_id4156296484514\"><alt id=\"alt_id15152796484514\">array fragment</alt></image>"
+msgstr ""
+
+#. zrpkq
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"hd_id731587304120258\n"
+"help.text"
+msgid "Parameters"
+msgstr ""
+
+#. dUCSu
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id951587051619162\n"
+"help.text"
+msgid "<emph>start:</emph> Lower bound of a dimension."
+msgstr ""
+
+#. yeb4H
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id951587052619162\n"
+"help.text"
+msgid "<emph>end:</emph> Upper bound of a dimension."
+msgstr ""
+
+#. wyE23
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id961587051702571\n"
+"help.text"
+msgid "Multiple dimensions for an array are denoted using comma (<emph>,</emph>) sign."
+msgstr ""
+
+#. bGJWo
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"hd_id231587046013458\n"
+"help.text"
+msgid "<variable id=\"typenameh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"data types fragment\"/></variable>typename fragment"
+msgstr ""
+
+#. AqfYj
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id501586753339474\n"
+"help.text"
+msgid "<image src=\"media/helpimg/sbasic/typename_fragment.svg\" id=\"img_id4157296484514\"><alt id=\"alt_id15152796484515\">primitive data types fragment</alt></image>"
+msgstr ""
+
+#. FcC7c
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"hd_id231587046013459\n"
+"help.text"
+msgid "<variable id=\"charh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"type declaration characters fragment\"/></variable>type-car fragment"
+msgstr ""
+
+#. JFwPg
+#: fragments.xhp
+msgctxt ""
+"fragments.xhp\n"
+"par_id511586753339474\n"
+"help.text"
+msgid "<image src=\"media/helpimg/sbasic/char_fragment.svg\" id=\"img_id4157296484514\"><alt id=\"alt_id15152796484516\">type declaration characters</alt></image>"
+msgstr ""
+
#. onSEk
#: keys.xhp
msgctxt ""
@@ -41470,14 +41515,14 @@ msgctxt ""
msgid "Replaces some string by another."
msgstr "将某个字符串替换为其他字符串。"
-#. 9uBGG
+#. 4cCHs
#: replace.xhp
msgctxt ""
"replace.xhp\n"
"par_id931552552227310\n"
"help.text"
-msgid "Replace (Text As String, SearchStr As String, ReplStr As String [, Start As Long [, Count as long [, Compare As Boolean]]]"
-msgstr "Replace (文本 As String, 搜索字符串 As String, 替换字符串 As String [, 开始 As Long [, 计数 as long [, 比较 As Boolean]]]"
+msgid "Replace (Text As String, SearchStr As String, ReplStr As String [, Start As Long [, Count as Long [, Compare As Boolean]]]"
+msgstr ""
#. iMDGH
#: replace.xhp
@@ -41515,14 +41560,14 @@ msgctxt ""
msgid "<emph>ReplStr:</emph> Any string expression that shall replace the found search string."
msgstr "「<emph>替换字符串</emph>」: 用来替换找到的搜索字符串的任意字符串表达式。"
-#. KfkZ4
+#. y6ZZR
#: replace.xhp
msgctxt ""
"replace.xhp\n"
"par_id111552552283060\n"
"help.text"
-msgid "<emph>Start:</emph> Numeric expression that indicates the character position within the string where the search shall begin. The maximum allowed value is 65535."
-msgstr "「<emph>开始</emph>」:数字表达式,指示在字符串中进行搜索的起始字符位置。允许的最大值为 65535。"
+msgid "<emph>Start:</emph> Numeric expression that indicates the character position where the search starts and also the start of the substring to be returned."
+msgstr ""
#. bLh8G
#: replace.xhp
@@ -41578,6 +41623,15 @@ msgctxt ""
msgid "REM * only first (respecting case) occurrence (parameter 5)"
msgstr "REM * 只替换第一次 (尊重大小写) 出现的地方 (参数 5)"
+#. QEPtG
+#: replace.xhp
+msgctxt ""
+"replace.xhp\n"
+"par_id861587778446685\n"
+"help.text"
+msgid "REM returns D*FGHI because the search starts at position 4, which is also the start of the returned string."
+msgstr ""
+
#. Z9NfM
#: special_vba_func.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/00.po b/source/zh-CN/helpcontent2/source/text/scalc/00.po
index 4172920d1d4..ae505021b56 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-03-31 10:35+0200\n"
+"POT-Creation-Date: 2020-04-27 15:54+0200\n"
"PO-Revision-Date: 2019-07-10 02:02+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -592,13 +592,13 @@ msgctxt ""
msgid "<variable id=\"einamen\">Choose <menuitem>Insert - Named Range or Expression</menuitem>.</variable>"
msgstr ""
-#. ASCUT
+#. VLxrw
#: 00000404.xhp
msgctxt ""
"00000404.xhp\n"
"par_id3146776\n"
"help.text"
-msgid "<variable id=\"eiextdata\">Choose <menuitem>Sheet - Link to External data</menuitem>.</variable>"
+msgid "<variable id=\"eiextdata\">Choose <menuitem>Sheet - Link to External Data</menuitem>.</variable>"
msgstr ""
#. ECgNS
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/01.po b/source/zh-CN/helpcontent2/source/text/scalc/01.po
index efba7ed730b..2730192516e 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: 2020-04-15 12:52+0200\n"
+"POT-Creation-Date: 2020-04-27 15:54+0200\n"
"PO-Revision-Date: 2019-08-06 23:26+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4813,6 +4813,15 @@ msgctxt ""
msgid "If the DatabaseField argument is omitted, DCOUNT returns the count of all records that satisfy Criteria. <embedvar href=\"text/scalc/01/04060101.xhp#quotes\"/>"
msgstr "如果不指定「数据库字段」参数,那么DCOUNT 返回所有满足条件的记录数量。 <embedvar href=\"text/scalc/01/04060101.xhp#quotes\"/>"
+#. ckYe4
+#: 04060101.xhp
+msgctxt ""
+"04060101.xhp\n"
+"par_id301587321851330\n"
+"help.text"
+msgid "If you choose to omit the DatabaseField argument, your formula should be of the form =DCOUNT(Database; ; SearchCriteria)."
+msgstr ""
+
#. F7cy4
#: 04060101.xhp
msgctxt ""
@@ -4885,6 +4894,15 @@ msgctxt ""
msgid "If the DatabaseField argument is omitted, DCOUNTA returns the count of all records that satisfy Criteria. <embedvar href=\"text/scalc/01/04060101.xhp#quotes\"/>"
msgstr "如果不指定「数据库字段」参数,DCOUNTA 将返回所有满足「条件」的记录数量。 <embedvar href=\"text/scalc/01/04060101.xhp#quotes\"/>"
+#. ESpfH
+#: 04060101.xhp
+msgctxt ""
+"04060101.xhp\n"
+"par_id31587322048553\n"
+"help.text"
+msgid "If you choose to omit the DatabaseField argument, your formula should be of the form =DCOUNTA(Database; ; SearchCriteria)."
+msgstr ""
+
#. xX6ve
#: 04060101.xhp
msgctxt ""
@@ -55465,13 +55483,13 @@ msgctxt ""
msgid "<variable id=\"CEILINGh1\"><link href=\"text/scalc/01/func_ceiling.xhp#ceiling\" name=\"CEILING\">CEILING</link></variable>"
msgstr ""
-#. E9m3Y
+#. Co8xT
#: func_ceiling.xhp
msgctxt ""
"func_ceiling.xhp\n"
"par_id3153422\n"
"help.text"
-msgid "<ahelp hid=\"HID_FUNC_OBERGRENZE\">Rounds a number up to the nearest multiple of s significance value.</ahelp>"
+msgid "<ahelp hid=\"HID_FUNC_OBERGRENZE\">Rounds a number to the nearest multiple of a significance value.</ahelp>"
msgstr ""
#. PfT3s
@@ -55483,13 +55501,13 @@ msgctxt ""
msgid "For a positive number and a positive significance value, the function rounds up (away from zero). For a negative number and a negative significance value, the direction of rounding is determined by the value of a mode parameter. The function returns an error if the number and significance values have opposite signs."
msgstr ""
-#. s9tRF
+#. 6AFh7
#: func_ceiling.xhp
msgctxt ""
"func_ceiling.xhp\n"
"par_id3163792\n"
"help.text"
-msgid "If the spreadsheet is exported to Microsoft Excel, the CEILING function is exported as the equivalent CEILING.MATH function that exists since Excel 2013. If you plan to use the spreadsheet with earlier Excel versions, use either CEILING.PRECISE that exists since Excel 2010, or CEILING.XCL that is exported as the CEILING function compatible with all Excel versions. Note that CEILING.XCL always rounds away from zero."
+msgid "If the spreadsheet is exported to Microsoft Excel, the CEILING function is exported as the equivalent CEILING.MATH function that has existed since Excel 2013. If you plan to use the spreadsheet with earlier Excel versions, use either CEILING.PRECISE that has existed since Excel 2010, or CEILING.XCL that is exported as the CEILING function compatible with all Excel versions."
msgstr ""
#. mZwNV
@@ -55636,15 +55654,6 @@ msgctxt ""
msgid "<emph>Significance</emph> (optional) is the value, or a reference to a cell containing the value, to whose multiple <emph>Number</emph> is to be rounded. It defaults to 1."
msgstr ""
-#. 6Vtow
-#: func_ceiling.xhp
-msgctxt ""
-"func_ceiling.xhp\n"
-"par_id461586211894475\n"
-"help.text"
-msgid "This function calculates identical results to the ISO.CEILING function"
-msgstr ""
-
#. 8WiRx
#: func_ceiling.xhp
msgctxt ""
@@ -55699,6 +55708,15 @@ msgctxt ""
msgid "For a positive number the function rounds up (away from zero). For a negative number, the direction of rounding is determined by the value of a mode parameter. The sign of the significance value is ignored."
msgstr ""
+#. aYczG
+#: func_ceiling.xhp
+msgctxt ""
+"func_ceiling.xhp\n"
+"par_id291516998575663\n"
+"help.text"
+msgid "This function exists for interoperability with Microsoft Excel 2013 or newer."
+msgstr ""
+
#. Km7yb
#: func_ceiling.xhp
msgctxt ""
@@ -55726,15 +55744,6 @@ msgctxt ""
msgid "<emph>Mode</emph> (optional) is a number, or a reference to a cell containing a number. If <emph>Mode</emph> is given and not equal to zero, a negative <emph>Number</emph> is rounded down (away from zero). If <emph>Mode</emph> is equal to zero or is not given, a negative <emph>Number</emph> is rounded up (towards zero)."
msgstr ""
-#. aYczG
-#: func_ceiling.xhp
-msgctxt ""
-"func_ceiling.xhp\n"
-"par_id291516998575663\n"
-"help.text"
-msgid "This function exists for interoperability with Microsoft Excel 2013 or newer."
-msgstr ""
-
#. je22s
#: func_ceiling.xhp
msgctxt ""
@@ -55942,13 +55951,13 @@ msgctxt ""
msgid "<input>=ISO.CEILING(3.45)</input> returns 4."
msgstr ""
-#. ENMYD
+#. xS2zM
#: func_ceiling.xhp
msgctxt ""
"func_ceiling.xhp\n"
"par_id181586214438808\n"
"help.text"
-msgid "<input>=ISO.CEILING(-45.67,2)</input> returns 44."
+msgid "<input>=ISO.CEILING(-45.67,2)</input> returns -44."
msgstr ""
#. GuEcB
@@ -57625,6 +57634,15 @@ msgctxt ""
msgid "For a positive number and a positive significance value, the function rounds down (towards zero). For a negative number and a negative significance value, the direction of rounding is determined by the value of a mode parameter. The function returns an error if the number and significance values have opposite signs."
msgstr ""
+#. 5kHtR
+#: func_floor.xhp
+msgctxt ""
+"func_floor.xhp\n"
+"par_id3163894\n"
+"help.text"
+msgid "If the spreadsheet is exported to Microsoft Excel, the FLOOR function is exported as the equivalent FLOOR.MATH function that has existed since Excel 2013. If you plan to use the spreadsheet with earlier Excel versions, use either FLOOR.PRECISE that has existed since Excel 2010, or FLOOR.XCL that is exported as the FLOOR function compatible with all Excel versions."
+msgstr ""
+
#. 2haGU
#: func_floor.xhp
msgctxt ""
@@ -57661,15 +57679,6 @@ msgctxt ""
msgid "<emph>Mode</emph> (optional) is a number, or a reference to a cell containing a number. The function only uses <emph>Mode</emph> if both <emph>Number</emph> and <emph>Significance</emph> are negative. Then if <emph>Mode</emph> is given and not equal to zero, numbers are rounded up (towards zero); if <emph>Mode</emph> is equal to zero or not given, negative numbers are rounded down (away from zero)."
msgstr ""
-#. 5kHtR
-#: func_floor.xhp
-msgctxt ""
-"func_floor.xhp\n"
-"par_id3163894\n"
-"help.text"
-msgid "If the spreadsheet is exported to Microsoft Excel, the FLOOR function is exported as the equivalent FLOOR.MATH function that has existed since Excel 2013. If you plan to use the spreadsheet with earlier Excel versions, use either FLOOR.PRECISE that has existed since Excel 2010, or FLOOR.XCL that is exported as the FLOOR function compatible with all Excel versions."
-msgstr ""
-
#. EU85r
#: func_floor.xhp
msgctxt ""
@@ -61495,23 +61504,23 @@ msgctxt ""
msgid "The function should be called with at least two parameters."
msgstr ""
-#. gwtEM
+#. hANRQ
#: func_rawsubtract.xhp
msgctxt ""
"func_rawsubtract.xhp\n"
"par_2016112109236\n"
"help.text"
-msgid "<item type=\"literal\">RAWSUBTRACT(0.987654321098765, 0.9876543210987)</item> returns 6.53921361504217E-14"
+msgid "<input>=RAWSUBTRACT(0.987654321098765, 0.9876543210987)</input> returns 6.53921361504217E-14"
msgstr ""
-#. QZT3B
+#. bgohX
#: func_rawsubtract.xhp
msgctxt ""
"func_rawsubtract.xhp\n"
"par_2016112109237\n"
"help.text"
-msgid "<item type=\"literal\">RAWSUBTRACT(0.987654321098765)</item> returns Err:511 (Missing variable) because RAWSUBTRACT requires a minimum of two numbers."
-msgstr "「<item type=\"literal\">RAWSUBTRACT(0.987654321098765)</item>」返回 Err:511 (缺少变量) 因为 RAWSUBTRACT 要求至少两个数字。"
+msgid "<input>=RAWSUBTRACT(0.987654321098765)</input> returns Err:511 (Missing variable) because RAWSUBTRACT requires a minimum of two numbers."
+msgstr ""
#. d9DP3
#: func_regex.xhp
@@ -65185,15 +65194,6 @@ msgctxt ""
msgid "Between Groups"
msgstr ""
-#. vuDTW
-#: statistics_anova.xhp
-msgctxt ""
-"statistics_anova.xhp\n"
-"par_id411554944014360\n"
-"help.text"
-msgid "3.340385558"
-msgstr ""
-
#. tpzCU
#: statistics_anova.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/guide.po b/source/zh-CN/helpcontent2/source/text/scalc/guide.po
index 89c2f3124f0..324625f5e0a 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-03-31 10:35+0200\n"
+"POT-Creation-Date: 2020-04-27 15:54+0200\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"
@@ -11860,67 +11860,67 @@ msgctxt ""
msgid "Select the cell range for the subtotals that you want to calculate, and remember to include the column heading labels. Alternatively, click on a single cell within your data to allow Calc to automatically identify the range."
msgstr ""
-#. owkFH
+#. QiBqE
#: subtotaltool.xhp
msgctxt ""
"subtotaltool.xhp\n"
"par_id421585177574387\n"
"help.text"
-msgid "Select <menuitem>Data > Subtotals</menuitem> from the Menu bar to open the Subtotals dialog."
+msgid "Choose <menuitem>Data - Subtotals</menuitem> to open the Subtotals dialog."
msgstr ""
-#. AmnUD
+#. BwAst
#: subtotaltool.xhp
msgctxt ""
"subtotaltool.xhp\n"
"par_id41585177608508\n"
"help.text"
-msgid "In the Group by drop-down list on the first Group page, select a column by its label. Entries in the cell range from step 1 will be grouped and sorted by matching values in this column."
+msgid "In the <emph>Group by</emph> drop-down list on the <emph>First Group</emph> page, select a column by its label. Entries in the cell range from step 1 will be grouped and sorted by matching values in this column."
msgstr ""
-#. dq83u
+#. QmNL9
#: subtotaltool.xhp
msgctxt ""
"subtotaltool.xhp\n"
"par_id451585177625978\n"
"help.text"
-msgid "In the Calculate subtotals for box on the first Group page, select a column containing values to be subtotaled. If you later change values in this column, Calc will automatically recalculate the subtotals."
+msgid "In the <emph>Calculate subtotals for</emph> box on the <emph>First Group</emph> page, select a column containing values to be subtotaled. If you later change values in this column, Calc will automatically recalculate the subtotals."
msgstr ""
-#. xFgAD
+#. CQ9km
#: subtotaltool.xhp
msgctxt ""
"subtotaltool.xhp\n"
"par_id661585177644535\n"
"help.text"
-msgid "In the Use function box on the first Group page, select a function to calculate the subtotals for the column selected in step 4."
+msgid "In the <emph>Use function</emph> box on the <emph>First Group</emph> page, select a function to calculate the subtotals for the column selected in step 4."
msgstr ""
-#. EhUvq
+#. 3eTTE
#: subtotaltool.xhp
msgctxt ""
"subtotaltool.xhp\n"
"par_id351585177661529\n"
"help.text"
-msgid "Repeat steps 4 and 5 to create subtotals for other columns on the first Group page."
+msgid "Repeat steps 4 and 5 to create subtotals for other columns on the <emph>First Group</emph> page."
msgstr ""
-#. aQRn7
+#. 6GLDr
#: subtotaltool.xhp
msgctxt ""
"subtotaltool.xhp\n"
"par_id511585177679372\n"
"help.text"
-msgid "You can create two more subtotal categories by using the second Group and third Group pages and repeating steps 3 to 6. If you do not want to add more groups, then leave the Group by list for each page set to “- none -”."
+msgid "You can create two more subtotal categories by using the <emph>Second Group</emph> and <emph>Third Group</emph> pages and repeating steps 3 to 6. If you do not want to add more groups, then leave the Group by list for each page set to “- none -”."
msgstr ""
-#. AaCGA
+#. HDB52
#: subtotaltool.xhp
msgctxt ""
"subtotaltool.xhp\n"
"par_id301585177698777\n"
"help.text"
-msgid "Click OK. Calc will add subtotal and grand total rows to your cell range."
+msgid "Click <emph>OK</emph>. Calc will add subtotal and grand total rows to your cell range."
msgstr ""
#. iMTer
@@ -11950,13 +11950,13 @@ msgctxt ""
msgid "This feature is useful if you have many subtotals, as you can simply hide low-level details, such as individual entries, to produce a high-level summary of your data."
msgstr ""
-#. SEYEM
+#. C97jN
#: subtotaltool.xhp
msgctxt ""
"subtotaltool.xhp\n"
"par_id161585178829165\n"
"help.text"
-msgid "To turn off outlines, select <menuitem>Data > Group and Outline > Remove Outline</menuitem> from the Menu bar. To reinstate them, select <menuitem>Data > Group and Outline > AutoOutline</menuitem>."
+msgid "To turn off outlines, choose <menuitem>Data - Group and Outline - Remove Outline</menuitem>. To reinstate them, choose <menuitem>Data - Group and Outline - AutoOutline</menuitem>."
msgstr ""
#. oU9ew
diff --git a/source/zh-CN/helpcontent2/source/text/shared/00.po b/source/zh-CN/helpcontent2/source/text/shared/00.po
index 39ebe72b927..6dd5b4547f3 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: 2020-03-31 10:35+0200\n"
+"POT-Creation-Date: 2020-04-27 15:54+0200\n"
"PO-Revision-Date: 2019-07-10 03:06+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6910,14 +6910,14 @@ msgctxt ""
msgid "<variable id=\"senden\">Menu <emph>File - Send</emph>.</variable>"
msgstr "<variable id=\"senden\">菜单「<emph>文件 - 发送</emph>」。</variable>"
-#. TEKGF
+#. E3vhr
#: 00000401.xhp
msgctxt ""
"00000401.xhp\n"
"par_id3145386\n"
"help.text"
-msgid "Choose <emph>File - Send - E-mail Document</emph>."
-msgstr "选择「<emph>文件 - 发送 - 以 E-mail 发送文档</emph>」。"
+msgid "Choose <emph>File - Send - Email Document</emph>."
+msgstr ""
#. ZaENF
#: 00000401.xhp
@@ -12418,22 +12418,22 @@ msgctxt ""
msgid "<variable id=\"verlauf\">Choose <emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Text Box and Shape - </emph> </caseinline><caseinline select=\"CALC\"><emph>Object - </emph></caseinline></switchinline><emph>Area - Gradients</emph> tab.</variable>"
msgstr "<variable id=\"verlauf\">选择「<emph>Format - </emph><switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Text Box and Shape - </emph> </caseinline><caseinline select=\"CALC\"><emph>Object - </emph></caseinline></switchinline><emph>区域 - 渐变</emph>」选项卡。</variable>"
-#. rE5He
+#. Vez5y
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
"par_id3155308\n"
"help.text"
-msgid "<variable id=\"schraffur\">Choose <menuitem>Format - </menuitem><switchinline select=\"appl\"><caseinline select=\"WRITER\"><menuitem>Text Box and Shape - </menuitem> </caseinline><caseinline select=\"CALC\"><menuitem>Object - </menuitem></caseinline><caseinline select=\"IMPRESS\"><menuitem>Object and Shape - </menuitem></caseinline></switchinline><menuitem>Area</menuitem><emph> - Hatch</emph> tab.</variable>"
+msgid "<variable id=\"schraffur\">Choose <menuitem>Format - </menuitem> <switchinline select=\"appl\"> <caseinline select=\"WRITER\"><menuitem>Text Box and Shape - </menuitem></caseinline> <caseinline select=\"CALC\"><menuitem>Object - </menuitem></caseinline> <caseinline select=\"IMPRESS\"><menuitem>Object and Shape - </menuitem></caseinline> </switchinline> <menuitem>Area - Hatch</menuitem> tab. </variable>"
msgstr ""
-#. poEmE
+#. phott
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
"par_id3155314\n"
"help.text"
-msgid "<variable id=\"page_hatch\"><switchinline select=\"appl\"><caseinline select=\"WRITER\">Choose <menuitem>Format - Page Style - Area</menuitem><emph> - Hatch</emph> tab.</caseinline> <caseinline select=\"DRAW\">Choose <menuitem>Page - Properties - Background</menuitem><emph> - Hatch</emph> tab.</caseinline><caseinline select=\"IMPRESS\">Choose <menuitem>Slide - Properties - Background</menuitem><emph> - Hatch</emph> tab.</caseinline></switchinline></variable>"
+msgid "<variable id=\"page_hatch\"> <switchinline select=\"appl\"> <caseinline select=\"WRITER\">Choose <menuitem>Format - Page Style - Area</menuitem></caseinline> <caseinline select=\"DRAW\">Choose <menuitem>Page - Properties - Background</menuitem></caseinline> <caseinline select=\"IMPRESS\">Choose <menuitem>Slide - Properties - Background</menuitem></caseinline> </switchinline> <emph> - Hatch</emph> tab. </variable>"
msgstr ""
#. J5DJs
@@ -14020,13 +14020,13 @@ msgctxt ""
msgid "Choose <menuitem>Edit - Paste Special - Paste Unformatted Text</menuitem>."
msgstr ""
-#. ngeHG
+#. BUPSo
#: edit_menu.xhp
msgctxt ""
"edit_menu.xhp\n"
"par_id431584825207430\n"
"help.text"
-msgid "Right click to open the context menu and choose <menuitem>Paste Special - Unformatted Text</menuitem>."
+msgid "Right-click to open the context menu and choose <menuitem>Paste Special - Unformatted Text</menuitem>."
msgstr ""
#. hUjhY
@@ -14047,13 +14047,13 @@ msgctxt ""
msgid "Choose <menuitem>Edit - Paste Special - Paste Nested Table</menuitem>."
msgstr ""
-#. oFtar
+#. AWiCd
#: edit_menu.xhp
msgctxt ""
"edit_menu.xhp\n"
"par_id701584824350359\n"
"help.text"
-msgid "Right click on the target table cell to open the context menu and choose <menuitem>Paste Special - Nested Table</menuitem>."
+msgid "Right-click on the target table cell to open the context menu and choose <menuitem>Paste Special - Nested Table</menuitem>."
msgstr ""
#. fLFXd
@@ -14065,13 +14065,13 @@ msgctxt ""
msgid "Choose <menuitem>Edit - Paste Special - Paste as Rows above</menuitem>."
msgstr ""
-#. EjC8L
+#. 7CnTy
#: edit_menu.xhp
msgctxt ""
"edit_menu.xhp\n"
"par_id961584822968492\n"
"help.text"
-msgid "Right click on the target table cell to open the context menu and choose <menuitem>Paste Special - Rows above</menuitem>."
+msgid "Right-click on the target table cell to open the context menu and choose <menuitem>Paste Special - Rows Above</menuitem>."
msgstr ""
#. 2xgA5
@@ -14083,13 +14083,13 @@ msgctxt ""
msgid "Choose <menuitem>Edit - Paste Special - Paste as Columns Before</menuitem>."
msgstr ""
-#. LBKGw
+#. CJBCG
#: edit_menu.xhp
msgctxt ""
"edit_menu.xhp\n"
"par_id61584824301756\n"
"help.text"
-msgid "Right click on the target table cell to open the context menu and choose <menuitem>Paste Special - Columns Before</menuitem>."
+msgid "Right-click on the target table cell to open the context menu and choose <menuitem>Paste Special - Columns Before</menuitem>."
msgstr ""
#. RPFZr
diff --git a/source/zh-CN/helpcontent2/source/text/shared/01.po b/source/zh-CN/helpcontent2/source/text/shared/01.po
index 7d71f985d60..38992d609d0 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-03-31 10:35+0200\n"
+"POT-Creation-Date: 2020-04-29 22:17+0200\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"
@@ -5362,23 +5362,23 @@ msgctxt ""
msgid "<link href=\"text/shared/01/01160200.xhp\" name=\"Document as E-mail\">E-mail Document</link>"
msgstr "<link href=\"text/shared/01/01160200.xhp\" name=\"Document as E-mail\">用电子邮件发送文档</link>"
-#. qLYd7
+#. Q86XQ
#: 01160000.xhp
msgctxt ""
"01160000.xhp\n"
"par_id4546342\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Opens a new window in your default e-mail program with the current document as an attachment. The OpenDocument file format is used.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">在默认电子邮件程序中打开新窗口,并将当前文档作为附件。使用 OpenDocument 文件格式。</ahelp>"
+msgid "<ahelp hid=\".\" visibility=\"hidden\">Opens a new window in your default email program with the current document as an attachment. The OpenDocument file format is used.</ahelp>"
+msgstr ""
-#. g9Tk8
+#. EiZei
#: 01160000.xhp
msgctxt ""
"01160000.xhp\n"
"par_id6845301\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Opens a new window in your default e-mail program with the current document as an attachment. The Microsoft file format is used.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">在默认电子邮件程序中打开新窗口,并将当前文档作为附件。使用 Microsoft 文件格式。</ahelp>"
+msgid "<ahelp hid=\".\" visibility=\"hidden\">Opens a new window in your default email program with the current document as an attachment. The Microsoft file format is used.</ahelp>"
+msgstr ""
#. EyYsF
#: 01160000.xhp
@@ -5389,14 +5389,14 @@ msgctxt ""
msgid "E-mail as OpenDocument Spreadsheet"
msgstr "以 OpenDocument 电子表格格式发送电子邮件"
-#. 8SrQW
+#. ewW2i
#: 01160000.xhp
msgctxt ""
"01160000.xhp\n"
"par_id5917844\n"
"help.text"
-msgid "Opens a new window in your default e-mail program with the current document as an attachment. The OpenDocument file format is used."
-msgstr "在默认电子邮件程序中打开新窗口,并将当前文档作为附件。使用 OpenDocument 文件格式。"
+msgid "Opens a new window in your default email program with the current document as an attachment. The OpenDocument file format is used."
+msgstr ""
#. FXCR6
#: 01160000.xhp
@@ -5407,14 +5407,14 @@ msgctxt ""
msgid "E-mail as Microsoft Excel"
msgstr "以 Microsoft Excel 格式发送电子邮件"
-#. 93SRR
+#. pLjdc
#: 01160000.xhp
msgctxt ""
"01160000.xhp\n"
"par_id5759453\n"
"help.text"
-msgid "Opens a new window in your default e-mail program with the current document as an attachment. The Microsoft Excel file format is used."
-msgstr "在默认电子邮件程序中打开新窗口,并将当前文档作为附件。使用 Microsoft Excel 文件格式。"
+msgid "Opens a new window in your default email program with the current document as an attachment. The Microsoft Excel file format is used."
+msgstr ""
#. UrGaf
#: 01160000.xhp
@@ -5425,14 +5425,14 @@ msgctxt ""
msgid "E-mail as OpenDocument Presentation"
msgstr "以 OpenDocument 演示文稿格式发送电子邮件"
-#. CFww7
+#. Ai2i2
#: 01160000.xhp
msgctxt ""
"01160000.xhp\n"
"par_id7829218\n"
"help.text"
-msgid "Opens a new window in your default e-mail program with the current document as an attachment. The OpenDocument file format is used."
-msgstr "在默认电子邮件程序中打开新窗口,并将当前文档作为附件。使用 OpenDocument 文件格式。"
+msgid "Opens a new window in your default email program with the current document as an attachment. The OpenDocument file format is used."
+msgstr ""
#. vtewB
#: 01160000.xhp
@@ -5443,14 +5443,14 @@ msgctxt ""
msgid "E-mail as Microsoft PowerPoint Presentation"
msgstr "以 Microsoft PowerPoint 演示文稿格式发送电子邮件"
-#. 2YKU6
+#. uDGxn
#: 01160000.xhp
msgctxt ""
"01160000.xhp\n"
"par_id8319650\n"
"help.text"
-msgid "Opens a new window in your default e-mail program with the current document as an attachment. The Microsoft PowerPoint file format is used."
-msgstr "在默认电子邮件程序中打开新窗口,并将当前文档作为附件。使用 Microsoft PowerPoint 文件格式。"
+msgid "Opens a new window in your default email program with the current document as an attachment. The Microsoft PowerPoint file format is used."
+msgstr ""
#. XFixi
#: 01160000.xhp
@@ -5461,14 +5461,14 @@ msgctxt ""
msgid "E-mail as OpenDocument Text"
msgstr "以 OpenDocument 文本格式发送电子邮件"
-#. 5bvD7
+#. Aewp6
#: 01160000.xhp
msgctxt ""
"01160000.xhp\n"
"par_id9085055\n"
"help.text"
-msgid "Opens a new window in your default e-mail program with the current document as an attachment. The OpenDocument file format is used."
-msgstr "在默认电子邮件程序中打开新窗口,并将当前文档作为附件。使用 OpenDocument 文件格式。"
+msgid "Opens a new window in your default email program with the current document as an attachment. The OpenDocument file format is used."
+msgstr ""
#. c9WaG
#: 01160000.xhp
@@ -5479,14 +5479,14 @@ msgctxt ""
msgid "E-mail as Microsoft Word"
msgstr "以 Microsoft Word 格式发送电子邮件"
-#. sPUwY
+#. dcXm5
#: 01160000.xhp
msgctxt ""
"01160000.xhp\n"
"par_id5421918\n"
"help.text"
-msgid "Opens a new window in your default e-mail program with the current document as an attachment. The Microsoft Word file format is used."
-msgstr "在默认电子邮件程序中打开新窗口,并将当前文档作为附件。使用 Microsoft Word 文件格式。"
+msgid "Opens a new window in your default email program with the current document as an attachment. The Microsoft Word file format is used."
+msgstr ""
#. 9Vye6
#: 01160000.xhp
@@ -5533,14 +5533,14 @@ msgctxt ""
msgid "<link href=\"text/shared/01/01160200.xhp\">E-mail Document</link>"
msgstr "<link href=\"text/shared/01/01160200.xhp\">用 E-mail 发送文档</link>"
-#. 6LyWZ
+#. 8prjP
#: 01160200.xhp
msgctxt ""
"01160200.xhp\n"
"par_id3152823\n"
"help.text"
-msgid "<variable id=\"versendentext\"><ahelp hid=\".uno:SendMail\">Opens a new window in your default e-mail program with the current document as an attachment. The current file format is used.</ahelp></variable> If the document is new and unsaved, the format specified in <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - Load/Save - General</emph> is used."
-msgstr "<variable id=\"versendentext\"><ahelp hid=\".uno:SendMail\">在默认电子邮件程序中打开新窗口,并将当前文档作为附件。使用当前文件格式。</ahelp></variable>如果文档是新的且尚未保存,则使用「<switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - 偏好设置</emph></caseinline><defaultinline><emph>工具 - 选项</emph></defaultinline></switchinline><emph> - 加载/保存 - 常规</emph>」中指定的格式。"
+msgid "<variable id=\"versendentext\"><ahelp hid=\".uno:SendMail\">Opens a new window in your default email program with the current document as an attachment. The current file format is used.</ahelp></variable> If the document is new and unsaved, the format specified in <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - Load/Save - General</emph> is used."
+msgstr ""
#. w48Rf
#: 01160200.xhp
@@ -13372,41 +13372,41 @@ msgctxt ""
msgid "<link href=\"text/shared/01/03170000.xhp\" name=\"Color Bar\">Color Bar</link>"
msgstr "<link href=\"text/shared/01/03170000.xhp\" name=\"颜色栏\">颜色栏</link>"
-#. 9XrFG
+#. Cm952
#: 03170000.xhp
msgctxt ""
"03170000.xhp\n"
"par_id3153255\n"
"help.text"
-msgid "<ahelp hid=\".uno:ColorControl\">Show or hides the <emph>Color</emph> bar. To modify or change the color table that is displayed, choose <emph>Format - Area</emph>, and then click on the <emph>Colors</emph> tab.</ahelp>"
-msgstr "<ahelp hid=\".uno:ColorControl\">显示或隐藏「<emph>颜色</emph>」栏。要修改显示的颜色表,请选择「<emph>格式 - 区域</emph>」,然后点击「<emph>颜色</emph>」选项卡。</ahelp>"
+msgid "<ahelp hid=\".uno:ColorControl\">Show or hide the <emph>Color</emph> bar. To modify or change the color table that is displayed, choose <emph>Format - Area</emph>, and then click on the <emph>Colors</emph> tab.</ahelp>"
+msgstr ""
-#. FeGUx
+#. EFZwD
#: 03170000.xhp
msgctxt ""
"03170000.xhp\n"
"par_id3154186\n"
"help.text"
-msgid "<ahelp hid=\"HID_COLOR_CTL_COLORS\">Click the color that you want to use. To change the fill color of an object in the current file, select the object and then click a color. To change the line color of the selected object, right-click a color. To change the color of text in a text object, double-click the text-object, select the text, and then click a color.</ahelp>"
-msgstr "<ahelp hid=\"HID_COLOR_CTL_COLORS\">点击要使用的颜色。要修改当前文件中对象的填充颜色,请选择该对象,然后点击一种颜色。要修改选中对象的线条颜色,请在一种颜色上点击鼠标右键。要修改文字对象中文字的颜色,请双击文字对象,选择所需的文字,然后点击一种颜色。</ahelp>"
+msgid "<ahelp hid=\"HID_COLOR_CTL_COLORS\">To change the fill color of an object in the current file, select the object and then click a color. To change the line color of the selected object, right-click a color. To change the color of text in a text object, double-click the text-object, select the text, and then click a color.</ahelp>"
+msgstr ""
-#. B8AUe
+#. bo2uz
#: 03170000.xhp
msgctxt ""
"03170000.xhp\n"
"par_id3147399\n"
"help.text"
-msgid "You can also drag a color from the <emph>Color</emph> bar and drop it on a draw object on your slide."
-msgstr "您还可以将颜色从「<emph>颜色</emph>」栏拖到幻灯片中的绘图对象上。"
+msgid "You can also drag a color from the <emph>Color</emph> bar and drop it on a draw object on your slide to change the fill color."
+msgstr ""
-#. Unnkj
+#. RxUos
#: 03170000.xhp
msgctxt ""
"03170000.xhp\n"
"par_id3147009\n"
"help.text"
-msgid "To detach the <emph>Color</emph> bar, click on a gray area of the toolbar and then drag. To reattach the <emph>Color</emph> bar, drag the title bar of the toolbar to the edge of the window."
-msgstr "要分离「<emph>颜色</emph>」栏,请点击工具栏的灰色区域,然后拖动鼠标。要重新附加「<emph>颜色</emph>」栏,请将工具栏的标题栏拖到窗口边缘。"
+msgid "To detach the <emph>Color</emph> bar, click on a gray area of the toolbar and then drag. To reattach the <emph>Color</emph> bar, double click on an gray area of the color bar while pressing the <switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> key."
+msgstr ""
#. pnFMd
#: 03990000.xhp
@@ -22930,302 +22930,275 @@ msgctxt ""
msgid "<ahelp hid=\"cui/ui/pageformatpage/spinMargBot\">Enter the amount of space to leave between the lower edge of the page and the document text.</ahelp>"
msgstr "<ahelp hid=\"cui/ui/pageformatpage/spinMargBot\">输入页面下边缘与文档文本之间的间距。</ahelp>"
-#. LvDHs
-#: 05040200.xhp
-msgctxt ""
-"05040200.xhp\n"
-"par_id0522200809473735\n"
-"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Aligns the text on the selected Page Style to a vertical page grid.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">将选中「页面样式」中的文本与垂直页面网格对齐。</ahelp>"
-
-#. f6Gk9
-#: 05040200.xhp
-msgctxt ""
-"05040200.xhp\n"
-"hd_id3150488\n"
-"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Register-true</caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\">对齐到垂直网格</caseinline></switchinline>"
-
-#. vFN34
-#: 05040200.xhp
-msgctxt ""
-"05040200.xhp\n"
-"par_id3151112\n"
-"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"cui/ui/pageformatpage/checkRegisterTrue\">Aligns the text on the selected Page Style to a vertical page grid.</ahelp> The spacing of the grid is defined by the <emph>Reference Style</emph>.</caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"cui/ui/pageformatpage/checkRegisterTrue\">将选中「页面样式」中的文本与垂直页网格对齐。</ahelp>网格的间距由「<emph>参考样式</emph>」定义。</caseinline></switchinline>"
-
-#. GQ3P2
+#. qBGYY
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id0522200809473732\n"
+"hd_id3147381\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. </ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">选择「段落样式」 (将用于选中页面样式中排列文本时的参考)。参考样式中指定的字体高度设置垂直页面网格的间距。</ahelp>"
+msgid "Layout settings"
+msgstr "版式设置"
-#. hjY4c
+#. 5vzdZ
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"hd_id3150686\n"
+"hd_id3145744\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Reference Style</caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"> <caseinline select=\"WRITER\">引用样式</caseinline> </switchinline>"
+msgid "Page layout"
+msgstr ""
-#. UwDHV
+#. DMwZG
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id3146146\n"
+"par_id3154218\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/pageformatpage/comboRegisterStyle\"><switchinline select=\"appl\"><caseinline select=\"WRITER\">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid.</caseinline></switchinline></ahelp>"
-msgstr "<ahelp hid=\"cui/ui/pageformatpage/comboRegisterStyle\"><switchinline select=\"appl\"> <caseinline select=\"WRITER\">选择「段落样式」 (将用于选中页面样式中排列文本时的参考)。参考样式中指定的字体高度设置垂直页面网格的间距。</caseinline> </switchinline></ahelp>"
+msgid "<ahelp hid=\"cui/ui/pageformatpage/comboPageLayout\">Specify whether the current style should show odd pages, even pages, or both odd and even pages.</ahelp>"
+msgstr ""
-#. Dipg6
+#. GTUc7
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"hd_id3147480\n"
+"hd_id3154946\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Table alignment</caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"CALC\">表格对齐方式</caseinline> </switchinline>"
+msgid "Right and left"
+msgstr ""
-#. sBfv3
+#. PHbNi
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id3150417\n"
+"par_id3153058\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Specify the alignment options for the cells on a printed page.</caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"> <caseinline select=\"CALC\">指定打印页上单元格的对齐选项。</caseinline> </switchinline>"
+msgid "The current page style shows both odd and even pages with left and right margins as specified."
+msgstr ""
-#. Rz6jD
+#. GDCeb
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id0522200809473845\n"
+"hd_id3147287\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Centers the cells horizontally on the printed page.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">水平居中打印页面上的单元格。</ahelp>"
+msgid "Mirrored"
+msgstr ""
-#. P9pHm
+#. Nz3A7
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"hd_id3147047\n"
+"par_id3147317\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Horizontal</caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"> <caseinline select=\"CALC\">水平方向</caseinline> </switchinline>"
+msgid "The current page style shows both odd and even pages with inner and outer margins as specified. Use this layout if you want to bind the printed pages like a book. Enter the binding space as the \"Inner\" margin."
+msgstr ""
-#. 3djJM
+#. HPAak
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id3153878\n"
+"hd_id3155308\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/pageformatpage/checkbuttonHorz\"><switchinline select=\"appl\"><caseinline select=\"CALC\">Centers the cells horizontally on the printed page.</caseinline></switchinline></ahelp>"
-msgstr "<ahelp hid=\"cui/ui/pageformatpage/checkbuttonHorz\"><switchinline select=\"appl\"> <caseinline select=\"CALC\">水平居中打印页上的单元格。</caseinline> </switchinline></ahelp>"
+msgid "Only right"
+msgstr ""
-#. TxE3H
+#. kxhBx
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id0522200809473811\n"
+"par_id3152885\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Centers the cells vertically on the printed page.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">垂直居中打印页面上的单元格。</ahelp>"
+msgid "The current page style shows only odd (right) pages. Even pages are shown as blank pages."
+msgstr ""
-#. 2e4aR
+#. VxnGV
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"hd_id3153522\n"
+"hd_id3157309\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Vertical</caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"> <caseinline select=\"CALC\">垂直方向</caseinline> </switchinline>"
+msgid "Only left"
+msgstr ""
-#. GXbtC
+#. 839AF
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id3149413\n"
+"par_id3147326\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/pageformatpage/checkbuttonVert\"><switchinline select=\"appl\"><caseinline select=\"CALC\">Centers the cells vertically on the printed page.</caseinline></switchinline></ahelp>"
-msgstr "<ahelp hid=\"cui/ui/pageformatpage/checkbuttonVert\"><switchinline select=\"appl\"> <caseinline select=\"CALC\">垂直居中打印页上的单元格。</caseinline> </switchinline></ahelp>"
+msgid "The current page style shows only even (left) pages. Odd pages are shown as blank pages."
+msgstr ""
-#. qBGYY
+#. Dmugm
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"hd_id3147381\n"
+"hd_id661587746131795\n"
"help.text"
-msgid "Layout settings"
-msgstr "版式设置"
+msgid "Slide Numbers"
+msgstr ""
-#. HDL59
+#. 8Gvk9
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"hd_id3151041\n"
+"par_id371587747950454\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>Page Layout</defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>页面版式</defaultinline></switchinline>"
+msgid "Select the slide numbering format that you want to use for the current slide style."
+msgstr ""
-#. EtZD9
+#. Jr6w4
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id3157962\n"
+"hd_id511587746163578\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>Select the page layout style to use in the current document.</defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>选择当前文档要应用的页面版式样式。</defaultinline> </switchinline>"
+msgid "Page Numbers"
+msgstr ""
-#. GFSVh
+#. GnD6W
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"hd_id3145744\n"
+"par_id3153745\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>Page layout</defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>页面版式</defaultinline></switchinline>"
+msgid "<ahelp hid=\"cui/ui/pageformatpage/comboLayoutFormat\">Select the page numbering format that you want to use for the current page style.</ahelp>"
+msgstr "<ahelp hid=\"cui/ui/pageformatpage/comboLayoutFormat\">请选择您想要在当前页面样式上使用的页面编号格式。</ahelp>"
-#. iyVDR
+#. z6iVY
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id3154218\n"
+"hd_id3150488\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/pageformatpage/comboPageLayout\"><switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>Specify whether the current style should show odd pages, even pages, or both odd and even pages.</defaultinline></switchinline></ahelp>"
-msgstr "<ahelp hid=\"cui/ui/pageformatpage/comboPageLayout\"><switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>指定当前样式是否显示奇数页、偶数页或是两者都显示。</defaultinline></switchinline></ahelp>"
+msgid "Register-true"
+msgstr ""
-#. 4QgRL
+#. xRZFb
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"hd_id3154946\n"
+"par_id3151112\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>Right and left</defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>右侧和左侧</defaultinline></switchinline>"
+msgid "<ahelp hid=\"cui/ui/pageformatpage/checkRegisterTrue\">Aligns the text on the selected Page Style to a vertical page grid.</ahelp> The spacing of the grid is defined by the <emph>Reference Style</emph>."
+msgstr ""
-#. pPpne
+#. GQ3P2
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id3153058\n"
+"par_id0522200809473732\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>The current page style shows both odd and even pages with left and right margins as specified.</defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>当前的页面样式使用指定的左边距和右边距显示奇数页和偶数页。</defaultinline></switchinline>"
+msgid "<ahelp hid=\".\" visibility=\"hidden\">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. </ahelp>"
+msgstr "<ahelp hid=\".\" visibility=\"hidden\">选择「段落样式」 (将用于选中页面样式中排列文本时的参考)。参考样式中指定的字体高度设置垂直页面网格的间距。</ahelp>"
-#. Mqqyj
+#. ja4mB
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"hd_id3147287\n"
+"hd_id3150686\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>Mirrored</defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>镜像</defaultinline></switchinline>"
+msgid "Reference Style"
+msgstr ""
-#. KzQZE
+#. hrqZy
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id3147317\n"
+"par_id3146146\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>The current page style shows both odd and even pages with inner and outer margins as specified. Use this layout if you want to bind the printed pages like a book. Enter the binding space as the \"Inner\" margin.</defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>当前的页面样式使用指定的内侧和外侧页边距显示奇数页和偶数页。如果想要将打印的页面装订得像一本书,请使用此版式。请输入装订间距作为「内侧」页边距。</defaultinline></switchinline>"
+msgid "<ahelp hid=\"cui/ui/pageformatpage/comboRegisterStyle\">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid.</ahelp>"
+msgstr ""
-#. FKFGE
+#. niqBy
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"hd_id3155308\n"
+"hd_id3147480\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>Only right</defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>仅限右侧</defaultinline></switchinline>"
+msgid "Table alignment"
+msgstr ""
-#. UEoaQ
+#. 2fKA6
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id3152885\n"
+"par_id3150417\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>The current page style shows only odd (right) pages. Even pages are shown as blank pages.</defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>当前的页面样式只显示奇数 (右) 页。偶数页显示为空白页。</defaultinline></switchinline>"
+msgid "Specify the alignment options for the cells on a printed page."
+msgstr ""
-#. 4Eg8X
+#. Rz6jD
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"hd_id3157309\n"
+"par_id0522200809473845\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>Only left</defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>仅限左侧</defaultinline></switchinline>"
+msgid "<ahelp hid=\".\" visibility=\"hidden\">Centers the cells horizontally on the printed page.</ahelp>"
+msgstr "<ahelp hid=\".\" visibility=\"hidden\">水平居中打印页面上的单元格。</ahelp>"
-#. MxqiB
+#. CMpSv
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id3147326\n"
+"hd_id3147047\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>The current page style shows only even (left) pages. Odd pages are shown as blank pages.</defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"DRAW\"></caseinline><caseinline select=\"IMPRESS\"></caseinline><defaultinline>当前的页面样式只显示偶数 (左) 页。奇数页显示为空白页。</defaultinline></switchinline>"
+msgid "Horizontal"
+msgstr ""
-#. vnByQ
+#. eARTv
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"hd_id3155366\n"
+"par_id3153878\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Register-true</caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\">对齐到垂直网格</caseinline></switchinline>"
+msgid "<ahelp hid=\"cui/ui/pageformatpage/checkbuttonHorz\">Centers the cells horizontally on the printed page.</ahelp>"
+msgstr ""
-#. jsxVp
+#. TxE3H
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"hd_id3083281\n"
+"par_id0522200809473811\n"
"help.text"
-msgid "Format"
-msgstr "格式"
+msgid "<ahelp hid=\".\" visibility=\"hidden\">Centers the cells vertically on the printed page.</ahelp>"
+msgstr "<ahelp hid=\".\" visibility=\"hidden\">垂直居中打印页面上的单元格。</ahelp>"
-#. GnD6W
+#. WkDEo
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id3153745\n"
+"hd_id3153522\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/pageformatpage/comboLayoutFormat\">Select the page numbering format that you want to use for the current page style.</ahelp>"
-msgstr "<ahelp hid=\"cui/ui/pageformatpage/comboLayoutFormat\">请选择您想要在当前页面样式上使用的页面编号格式。</ahelp>"
+msgid "Vertical"
+msgstr ""
-#. 5zUHB
+#. o9bGn
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
-"par_id0522200809473965\n"
+"par_id3149413\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Resizes the drawing objects so that they fit on the paper format that you select. The arrangement of the drawing objects is preserved.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">调整绘图对象的大小使其适应所选的纸张格式。绘图对象的排序保持不变。</ahelp>"
+msgid "<ahelp hid=\"cui/ui/pageformatpage/checkbuttonVert\">Centers the cells vertically on the printed page.</ahelp>"
+msgstr ""
-#. eBEs3
+#. uCEW9
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
"hd_id3151318\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"OFFICE\"></caseinline><caseinline select=\"WRITER\"></caseinline><caseinline select=\"CALC\"></caseinline><caseinline select=\"CHART\"></caseinline><caseinline select=\"MATH\"></caseinline><caseinline select=\"IMAGE\"></caseinline><defaultinline>AutoFit object to page format</defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"OFFICE\"></caseinline><caseinline select=\"WRITER\"></caseinline><caseinline select=\"CALC\"></caseinline><caseinline select=\"CHART\"></caseinline><caseinline select=\"MATH\"></caseinline><caseinline select=\"IMAGE\"></caseinline><defaultinline>按照页面格式自动调整对象</defaultinline> </switchinline>"
+msgid "Fit object to page format"
+msgstr ""
-#. 8bAyw
+#. AEasi
#: 05040200.xhp
msgctxt ""
"05040200.xhp\n"
"par_id3144746\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"OFFICE\"></caseinline><caseinline select=\"WRITER\"></caseinline><caseinline select=\"CALC\"></caseinline><caseinline select=\"CHART\"></caseinline><caseinline select=\"MATH\"></caseinline><caseinline select=\"IMAGE\"></caseinline><defaultinline><ahelp hid=\"cui/ui/pageformatpage/checkAdaptBox\">Resizes the drawing objects so that they fit on the paper format that you select. The arrangement of the drawing objects is preserved.</ahelp></defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"OFFICE\"></caseinline><caseinline select=\"WRITER\"></caseinline><caseinline select=\"CALC\"></caseinline><caseinline select=\"CHART\"></caseinline><caseinline select=\"MATH\"></caseinline><caseinline select=\"IMAGE\"></caseinline><defaultinline><ahelp hid=\"cui/ui/pageformatpage/checkAdaptBox\">根据所选纸张格式修改绘图对象的大小。绘图对象原有的排序保持不变。</ahelp></defaultinline> </switchinline>"
+msgid "<ahelp hid=\"cui/ui/pageformatpage/checkAdaptBox\">Resizes the drawing objects so that they fit on the paper format that you select. The arrangement of the drawing objects is preserved.</ahelp>"
+msgstr ""
#. CFGcg
#: 05040200.xhp
@@ -47446,13 +47419,13 @@ msgctxt ""
msgid "JPEG compression"
msgstr ""
-#. z3ei4
+#. kiiWk
#: ref_pdf_export_general.xhp
msgctxt ""
"ref_pdf_export_general.xhp\n"
"par_idN10734\n"
"help.text"
-msgid "<ahelp hid=\".\">Selects a JPEG compression of images. With a high quality level, almost all pixels are preserved. With a low quality level, some pixels get lost and artefacts are introduced, but file sizes are reduced.</ahelp>"
+msgid "<ahelp hid=\".\">Select a JPEG compression level. With a high quality level, almost all pixels are preserved. With a low quality level, some pixels are lost and artifacts are introduced, but file sizes are reduced.</ahelp>"
msgstr ""
#. MZoXB
diff --git a/source/zh-CN/helpcontent2/source/text/shared/explorer/database.po b/source/zh-CN/helpcontent2/source/text/shared/explorer/database.po
index 8a72cfee273..a9851c6e911 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/explorer/database.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/explorer/database.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2019-08-21 21:37+0200\n"
+"POT-Creation-Date: 2020-04-27 15:55+0200\n"
"PO-Revision-Date: 2019-07-10 01:38+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -7432,14 +7432,14 @@ msgctxt ""
msgid "Database Wizard"
msgstr "数据库向导"
-#. XLALx
+#. 3PAca
#: dabawiz00.xhp
msgctxt ""
"dabawiz00.xhp\n"
"bm_id2026429\n"
"help.text"
-msgid "<bookmark_value>wizards;databases (Base)</bookmark_value><bookmark_value>Database Wizard (Base)</bookmark_value><bookmark_value>databases; formats (Base)</bookmark_value><bookmark_value>MySQL databases (Base)</bookmark_value><bookmark_value>dBASE; database settings (Base)</bookmark_value><bookmark_value>spreadsheets;as databases (base)</bookmark_value>"
-msgstr "<bookmark_value>向导; 数据库 (Base)</bookmark_value><bookmark_value>数据库向导 (Base)</bookmark_value><bookmark_value>数据库; 格式 (Base)</bookmark_value><bookmark_value>MySQL 数据库 (Base)</bookmark_value><bookmark_value>dBASE; 数据库设置 (Base)</bookmark_value><bookmark_value>电子表格; 作为数据库 (base)</bookmark_value>"
+msgid "<bookmark_value>wizards;databases (Base)</bookmark_value><bookmark_value>Database Wizard (Base)</bookmark_value><bookmark_value>databases; formats (Base)</bookmark_value><bookmark_value>MySQL databases (Base)</bookmark_value><bookmark_value>MariaDB databases (Base)</bookmark_value><bookmark_value>dBASE; database settings (Base)</bookmark_value><bookmark_value>spreadsheets;as databases (base)</bookmark_value>"
+msgstr ""
#. 4QDPm
#: dabawiz00.xhp
@@ -7558,15 +7558,6 @@ msgctxt ""
msgid "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">Set up Oracle database connection</link>"
msgstr "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">设置 Oracle 数据库连接</link>"
-#. 5MVrE
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN1065B\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02mysql.xhp\">MySQL settings</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02mysql.xhp\">MySQL 设置</link>"
-
#. sSrMX
#: dabawiz00.xhp
msgctxt ""
@@ -7810,15 +7801,6 @@ msgctxt ""
msgid "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">Set up Oracle database connection</link>"
msgstr "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">设置 Oracle 数据库连接</link>"
-#. amnDm
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10685\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02mysql.xhp\">MySQL settings</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02mysql.xhp\">MySQL 设置</link>"
-
#. JtGv6
#: dabawiz01.xhp
msgctxt ""
@@ -8701,23 +8683,131 @@ msgctxt ""
msgid "MySQL Connection"
msgstr "MySQL 连接"
-#. rHNho
+#. B5kKY
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"bm_id861587404584956\n"
+"help.text"
+msgid "<bookmark_value>MariaDB settings (base)</bookmark_value><bookmark_value>MySQL settings (base)</bookmark_value>"
+msgstr ""
+
+#. f4CzF
#: dabawiz02mysql.xhp
msgctxt ""
"dabawiz02mysql.xhp\n"
"par_idN10549\n"
"help.text"
-msgid "<variable id=\"mysql\"><link href=\"text/shared/explorer/database/dabawiz02mysql.xhp\">MySQL Connection</link></variable>"
-msgstr "<variable id=\"mysql\"><link href=\"text/shared/explorer/database/dabawiz02mysql.xhp\">MySQL 连接</link></variable>"
+msgid "<variable id=\"mysql\"><link href=\"text/shared/explorer/database/dabawiz02mysql.xhp\">MariaDB and MySQL Connection</link></variable>"
+msgstr ""
-#. gyEi3
+#. 5FPU6
#: dabawiz02mysql.xhp
msgctxt ""
"dabawiz02mysql.xhp\n"
"par_idN1054D\n"
"help.text"
-msgid "<ahelp hid=\".\">Specifies the options for MySQL databases.</ahelp>"
-msgstr "<ahelp hid=\".\">指定有关 MySQL 数据库的选项。</ahelp>"
+msgid "<ahelp hid=\".\">Specifies the options for MariaDB and MySQL databases.</ahelp>"
+msgstr ""
+
+#. Bmcwo
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"hd_id661587405298284\n"
+"help.text"
+msgid "Direct Connection for MariaDB and MySQL databases"
+msgstr ""
+
+#. vd9VD
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"hd_id321587405303769\n"
+"help.text"
+msgid "Database name"
+msgstr ""
+
+#. 6LAsi
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_id371587405314376\n"
+"help.text"
+msgid "Enter the name of the MariaDB or MySQL database. Ask your database administrator for the correct name."
+msgstr ""
+
+#. jbdZp
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"hd_id561587405334695\n"
+"help.text"
+msgid "Server URL"
+msgstr ""
+
+#. Dw4Qu
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_id521587405341138\n"
+"help.text"
+msgid "Enter the URL for the database server. This is the name of the machine that runs the MariaDB or MYSQL database. You can also replace hostname with the IP address of the server."
+msgstr ""
+
+#. MZQiq
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"hd_id171587405349438\n"
+"help.text"
+msgid "Port number"
+msgstr ""
+
+#. J2SR3
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_id1001587405358390\n"
+"help.text"
+msgid "Enter the port number for the database server. Ask your database administrator for the correct port address. The default port number for MySQL or MariaDB databases is 3306."
+msgstr ""
+
+#. ovKhU
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"hd_id121587407845730\n"
+"help.text"
+msgid "Named Pipe"
+msgstr ""
+
+#. Rq89B
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_id941587407987180\n"
+"help.text"
+msgid "If the MariaDB or MySQL database is to be accessed by a named pipe, enter its name."
+msgstr ""
+
+#. wF6bj
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"hd_id161587405553671\n"
+"help.text"
+msgid "Socket"
+msgstr ""
+
+#. e8DB2
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_id161587405561472\n"
+"help.text"
+msgid "If the MariaDB or MySQL database is to be accessed by a socket, enter the socket ID."
+msgstr ""
#. fpBNu
#: dabawiz02mysql.xhp
@@ -14721,4 +14811,3 @@ msgctxt ""
"help.text"
msgid "<ahelp hid=\".\">Renames the selected report.</ahelp>"
msgstr "<ahelp hid=\".\">重命名选中报表。</ahelp>"
-
diff --git a/source/zh-CN/helpcontent2/source/text/shared/guide.po b/source/zh-CN/helpcontent2/source/text/shared/guide.po
index 7ca88ae97d5..152576ab1de 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-03-13 12:06+0100\n"
+"POT-Creation-Date: 2020-04-27 15:55+0200\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"
@@ -4534,15 +4534,6 @@ msgctxt ""
msgid "SYLK"
msgstr "SYLK"
-#. hmDBC
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_calc115\n"
-"help.text"
-msgid "text/spreadsheet"
-msgstr "text/spreadsheet"
-
#. NGUiE
#: convertfilters.xhp
msgctxt ""
@@ -10708,23 +10699,23 @@ msgctxt ""
msgid "Working in $[officename], you can send the current document as an e-mail attachment."
msgstr "可以将当前文档从 $[officename] 当作一个电子邮件的附件寄发。"
-#. mkBqj
+#. 8jsBd
#: email.xhp
msgctxt ""
"email.xhp\n"
"par_id3147335\n"
"help.text"
-msgid "Choose <emph>File - Send - E-mail Document</emph>."
-msgstr "选择「<emph>文件 - 发送 - 以 E-mail 发送文档</emph>」。"
+msgid "Choose <emph>File - Send - Email Document</emph>."
+msgstr ""
-#. ViJCg
+#. EGqDe
#: email.xhp
msgctxt ""
"email.xhp\n"
"par_id3153127\n"
"help.text"
-msgid "$[officename] opens your default e-mail program.<switchinline select=\"sys\"><caseinline select=\"UNIX\"> If you want to send the current document with another e-mail program, you can select the program to use with <emph>Internet - E-mail</emph> in the Options dialog box.</caseinline></switchinline>"
-msgstr "$[officename] 会打开默认的电子邮件程序。<switchinline select=\"sys\"><caseinline select=\"UNIX\">如果要使用其他电子邮件程序发送当前文档,可以通过使用「选项」对话框中的「<emph>互联网 - 电子邮件</emph>」选择该程序。</caseinline></switchinline>"
+msgid "$[officename] opens your default email program.<switchinline select=\"sys\"><caseinline select=\"UNIX\"> If you want to send the current document with another email program, you can select the program to use with <emph>Internet - Email</emph> in the Options dialog box.</caseinline></switchinline>"
+msgstr ""
#. 3vDxY
#: email.xhp
@@ -20158,13 +20149,13 @@ msgctxt ""
msgid "URL or Text"
msgstr ""
-#. XRjvN
+#. ikC8E
#: qrcode.xhp
msgctxt ""
"qrcode.xhp\n"
"par_id251566316519649\n"
"help.text"
-msgid "The text for which the QR Code is generated."
+msgid "The text from which to generate the QR code."
msgstr ""
#. 6mj5K
@@ -20239,13 +20230,13 @@ msgctxt ""
msgid "Border"
msgstr ""
-#. AbnEH
+#. wz9kT
#: qrcode.xhp
msgctxt ""
"qrcode.xhp\n"
"par_id981566316947064\n"
"help.text"
-msgid "The border width in dots surrounding the QR Code. Must be a non-negative value."
+msgid "The width in dots of the border surrounding the QR code."
msgstr ""
#. kZPNW
@@ -20446,22 +20437,22 @@ msgctxt ""
msgid "The <emph>Redacted Export</emph> button box has two options:"
msgstr ""
-#. H66t9
+#. pBqFG
#: redaction.xhp
msgctxt ""
"redaction.xhp\n"
"par_id551562796791417\n"
"help.text"
-msgid "<emph>Redacted Export (Black)</emph>: finalize your document by converting the transparent grey redaction shapes to opaque black and export as a pixellized PDF file."
+msgid "<emph>Redacted Export (Black)</emph>: finalize your document by converting the semitransparent redaction shapes to opaque black and export as a pixellized PDF file."
msgstr ""
-#. o3usW
+#. Z5u4M
#: redaction.xhp
msgctxt ""
"redaction.xhp\n"
"par_id191562796822685\n"
"help.text"
-msgid "<emph>Redacted Export (White)</emph>: finalize your document by converting the transparent grey redaction shapes to opaque white shapes, and export as a pixellized PDF file."
+msgid "<emph>Redacted Export (White)</emph>: finalize your document by converting the semitransparent redaction shapes to opaque white shapes, and export as a pixellized PDF file."
msgstr ""
#. 2w5mE
diff --git a/source/zh-CN/helpcontent2/source/text/shared/optionen.po b/source/zh-CN/helpcontent2/source/text/shared/optionen.po
index 2e94ba95c4a..80bb6171500 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-03-31 10:35+0200\n"
+"POT-Creation-Date: 2020-04-27 15:55+0200\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"
@@ -2437,14 +2437,14 @@ msgctxt ""
msgid "The Pick a Color Window"
msgstr "「选取颜色」对话框"
-#. 5u2bL
+#. Xu7fM
#: 01010501.xhp
msgctxt ""
"01010501.xhp\n"
"par_id3148944\n"
"help.text"
-msgid "The Pick a Color Dialog window consist of four main areas."
-msgstr "「选取颜色」对话框窗口包含四大块。"
+msgid "The Pick a Color dialog consists of four main areas."
+msgstr ""
#. JA9HB
#: 01010501.xhp
@@ -2536,14 +2536,14 @@ msgctxt ""
msgid "Red"
msgstr "红"
-#. KRqXB
+#. kAiQV
#: 01010501.xhp
msgctxt ""
"01010501.xhp\n"
"par_id3153727\n"
"help.text"
-msgid "<ahelp hid=\".\">Sets the Red component modifiable on the vertical color slider, and the Green and Blue components in the two dimensional color picker field. Allowed values are 0 to 255.</ahelp>"
-msgstr "<ahelp hid=\".\">设置「红色」部分在纵向颜色滑块上可修改,「绿色」与「蓝色」部分可在在二维取色器字段修改。允许的数值为 0 到 255。</ahelp>"
+msgid "<ahelp hid=\".\">Sets the Red component modifiable on the vertical color slider, and the Green and Blue components in the two-dimensional color picker field. Allowed values are 0 to 255.</ahelp>"
+msgstr ""
#. G5BRr
#: 01010501.xhp
@@ -2563,14 +2563,14 @@ msgctxt ""
msgid "Green"
msgstr "绿"
-#. LNRYj
+#. jBJPJ
#: 01010501.xhp
msgctxt ""
"01010501.xhp\n"
"par_id3153728\n"
"help.text"
-msgid "<ahelp hid=\".\">Sets the Green component modifiable on the vertical color slider, and the Red and Blue components in the two dimensional color picker field. Allowed values are 0 to 255.</ahelp>"
-msgstr "<ahelp hid=\".\">设置「绿色」部分在纵向颜色滑块上可修改,「红色」与「蓝色」部分可在在二维取色器字段修改。允许的数值为 0 到 255。</ahelp>"
+msgid "<ahelp hid=\".\">Sets the Green component modifiable on the vertical color slider, and the Red and Blue components in the two-dimensional color picker field. Allowed values are 0 to 255.</ahelp>"
+msgstr ""
#. NauiA
#: 01010501.xhp
@@ -2590,14 +2590,14 @@ msgctxt ""
msgid "Blue"
msgstr "蓝"
-#. 6NiMC
+#. gBqSU
#: 01010501.xhp
msgctxt ""
"01010501.xhp\n"
"par_id3153729\n"
"help.text"
-msgid "<ahelp hid=\".\">Sets the Blue component modifiable on the vertical color slider, and the Green and Red components in the two dimensional color picker field. Allowed values are 0 to 255.</ahelp>"
-msgstr "<ahelp hid=\".\">设置「蓝色」部分在纵向颜色滑块上可修改,「绿色」与「红色」部分可在二维取色器字段修改。允许的数值为 0 到 255。</ahelp>"
+msgid "<ahelp hid=\".\">Sets the Blue component modifiable on the vertical color slider, and the Green and Red components in the two-dimensional color picker field. Allowed values are 0 to 255.</ahelp>"
+msgstr ""
#. EHQDG
#: 01010501.xhp
@@ -2644,14 +2644,14 @@ msgctxt ""
msgid "Hue"
msgstr "色度"
-#. 7Myy2
+#. 7Zvps
#: 01010501.xhp
msgctxt ""
"01010501.xhp\n"
"par_id3153730\n"
"help.text"
-msgid "<ahelp hid=\".\">Sets the Hue component modifiable on the vertical color slider, and the Saturation and Brightness components in the two dimensional color picker field. Values are expressed in degrees from 0 to 359.</ahelp>"
-msgstr "<ahelp hid=\".\">设置「色度」部分在纵向颜色滑块上可修改,「饱和度」与「亮度」部分可在二维取色器字段修改。允许的数值为 0 到 359。</ahelp>"
+msgid "<ahelp hid=\".\">Sets the Hue component modifiable on the vertical color slider, and the Saturation and Brightness components in the two-dimensional color picker field. Values are expressed in degrees from 0 to 359.</ahelp>"
+msgstr ""
#. fGAJ5
#: 01010501.xhp
@@ -2671,14 +2671,14 @@ msgctxt ""
msgid "Saturation"
msgstr "饱和度"
-#. JwuTb
+#. 7KBnT
#: 01010501.xhp
msgctxt ""
"01010501.xhp\n"
"par_id3153731\n"
"help.text"
-msgid "<ahelp hid=\".\">Sets the Saturation component modifiable on the vertical color slider, and the Hue and Brightness components in the two dimensional color picker field. Values are expressed in percent ( 0 to 100).</ahelp>"
-msgstr "<ahelp hid=\".\">设置「饱和度」部分在纵向颜色滑块上可修改,「色度」与「亮度」部分可在二维取色器字段修改。数值以百分比表示 (0 到 100)。</ahelp>"
+msgid "<ahelp hid=\".\">Sets the Saturation component modifiable on the vertical color slider, and the Hue and Brightness components in the two-dimensional color picker field. Values are expressed in percent (0 to 100).</ahelp>"
+msgstr ""
#. cuCGT
#: 01010501.xhp
@@ -2698,14 +2698,14 @@ msgctxt ""
msgid "Brightness"
msgstr "亮度"
-#. 8vuKh
+#. NEpUE
#: 01010501.xhp
msgctxt ""
"01010501.xhp\n"
"par_id3153732\n"
"help.text"
-msgid "<ahelp hid=\".\">Sets the Brightness component modifiable on the vertical color slider, and the Hue and Saturation components in the two dimensional color picker field. Values are expressed in percent ( 0 to 100).</ahelp>"
-msgstr "<ahelp hid=\".\">设置「亮度」部分在纵向颜色滑块上可修改,「色度」与「饱和度」部分可在二维取色器字段修改。数值以百分比表示 (0 到 100)。</ahelp>"
+msgid "<ahelp hid=\".\">Sets the Brightness component modifiable on the vertical color slider, and the Hue and Saturation components in the two-dimensional color picker field. Values are expressed in percent (0 to 100).</ahelp>"
+msgstr ""
#. uDLZu
#: 01010501.xhp
@@ -2986,13 +2986,13 @@ msgctxt ""
msgid "%PRODUCTNAME File Associations"
msgstr ""
-#. ZFtaG
+#. sAAWp
#: 01010600.xhp
msgctxt ""
"01010600.xhp\n"
"hd_id81581845691263\n"
"help.text"
-msgid "Windows Default apps"
+msgid "Windows Default Apps"
msgstr ""
#. BnQGA
@@ -4363,13 +4363,13 @@ msgctxt ""
msgid "<ahelp hid=\"cui/ui/optappearancepage/colorconfig\">Select the colors for the user interface elements.</ahelp>"
msgstr "<ahelp hid=\"cui/ui/optappearancepage/colorconfig\">选择用于用户界面元素的颜色。</ahelp>"
-#. gBGAR
+#. 4JfXR
#: 01012000.xhp
msgctxt ""
"01012000.xhp\n"
"par_id3150769\n"
"help.text"
-msgid "To apply a color to a <emph>user interface element</emph>, ensure that the checkbox in front of the name is marked. To hide a user interface element, clear the check box."
+msgid "To apply a color to a <emph>user interface element</emph>, ensure that the box in front of the name is checked. To hide a user interface element, clear the check box."
msgstr ""
#. LRXwH
diff --git a/source/zh-CN/helpcontent2/source/text/simpress/guide.po b/source/zh-CN/helpcontent2/source/text/simpress/guide.po
index b7b56b48ceb..076be9330e7 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: 2020-01-07 14:10+0100\n"
+"POT-Creation-Date: 2020-04-27 15:55+0200\n"
"PO-Revision-Date: 2019-08-20 10:23+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,14 +43,14 @@ msgctxt ""
msgid "<variable id=\"3d_create\"><link href=\"text/simpress/guide/3d_create.xhp\" name=\"Converting 2D Objects to Curves, Polygons, and 3D Objects\">Converting 2D Objects to Curves, Polygons, and 3D Objects</link></variable>"
msgstr "<variable id=\"3d_create\"><link href=\"text/simpress/guide/3d_create.xhp\" name=\"将平面对象转换成曲线、多边形和三维对象\">将平面对象转换成曲线、多边形和三维对象</link></variable>"
-#. 34igE
+#. eDyDq
#: 3d_create.xhp
msgctxt ""
"3d_create.xhp\n"
"par_id3153914\n"
"help.text"
-msgid "You can convert two dimensional (2D) objects to create different shapes. $[officename] can convert 2D objects to the following object types:"
-msgstr "您可以转换平面图形对象以创建其他形状。$[officename] 能够将平面图形对象转换成以下类型的对象:"
+msgid "You can convert two-dimensional (2D) objects to create different shapes. $[officename] can convert 2D objects to the following object types:"
+msgstr ""
#. dog6J
#: 3d_create.xhp
@@ -4606,14 +4606,14 @@ msgctxt ""
msgid "Locate the files you want to insert."
msgstr "找到希望插入的文件。"
-#. F8Go2
+#. EPWAM
#: photo_album.xhp
msgctxt ""
"photo_album.xhp\n"
"par_id221120161524594919\n"
"help.text"
-msgid "Note: If several images are in the same folder, you can select a group of photos using the Shift or Ctrl keys while clicking on their filenames."
-msgstr "注: 如果多张图像位于同一个文件夹,可以在点击文件名的同时按「Shift」或「Ctrl」键选择多张照片。"
+msgid "If several images are in the same folder, you can select a group of photos using the Shift or Ctrl keys while clicking on their filenames."
+msgstr ""
#. z7nPC
#: photo_album.xhp
@@ -4624,14 +4624,14 @@ msgctxt ""
msgid "Click <item type=\"menuitem\">Open</item> to add the files to the Photo Album."
msgstr "点击「<item type=\"menuitem\">打开</item>」将文件添加到「照片专辑」。"
-#. RER5u
+#. xG2Jt
#: photo_album.xhp
msgctxt ""
"photo_album.xhp\n"
"par_id221120161524591012\n"
"help.text"
-msgid "Tip: Click on a file name to display it in the <item type=\"menuitem\">Preview</item> area"
-msgstr "提示: 点击文件名,可在「<item type=\"menuitem\">预览</item>」区域显示文件"
+msgid "Click on a file name to display it in the <item type=\"menuitem\">Preview</item> area"
+msgstr ""
#. tkYeB
#: photo_album.xhp
@@ -4687,14 +4687,14 @@ msgctxt ""
msgid "Click <item type=\"menuitem\">Insert Slides</item>."
msgstr "点击「<item type=\"menuitem\">插入幻灯片</item>」。"
-#. RiddC
+#. VJePm
#: photo_album.xhp
msgctxt ""
"photo_album.xhp\n"
"par_id221120161524501012\n"
"help.text"
-msgid "Warning: Clicking Undo will not delete a photo album. Right-click the slides on the slide panel and select <item type=\"menuitem\">Delete Slide</item> to delete the slides."
-msgstr "警告: 点击「撤消」不会将照片专辑删除。要删除幻灯片,请在幻灯片面板右击幻灯片,并选择「<item type=\"menuitem\">删除幻灯片</item>」。"
+msgid "Clicking Undo will not delete a photo album. Right-click the slides on the slide panel and select <item type=\"menuitem\">Delete Slide</item> to delete the slides."
+msgstr ""
#. cs5Gr
#: photo_album.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/smath/01.po b/source/zh-CN/helpcontent2/source/text/smath/01.po
index 452a9321725..7e9d3dc10a5 100644
--- a/source/zh-CN/helpcontent2/source/text/smath/01.po
+++ b/source/zh-CN/helpcontent2/source/text/smath/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-03-31 10:35+0200\n"
+"POT-Creation-Date: 2020-04-27 15:55+0200\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"
@@ -13822,13 +13822,13 @@ msgctxt ""
msgid "<variable id=\"chemicalh1\"><link href=\"text/smath/01/chemical.xhp\" name=\"Chemical Formulas\">Chemical Formulas Examples</link></variable>"
msgstr ""
-#. 9RNL8
+#. Uo7jh
#: chemical.xhp
msgctxt ""
"chemical.xhp\n"
"par_id111584200892379\n"
"help.text"
-msgid "The primary purpose of %PRODUCTNAME Math is to create mathematical formulas, but it can also be used to write chemical formulas. However, in chemical formulas, the chemical symbols are normally written in uppercase using non-italic characters."
+msgid "The primary purpose of %PRODUCTNAME Math is to create mathematical formulas, but it can also be used to write chemical formulas. However, in chemical formulas, the chemical symbols are normally written in uppercase using upright, rather than italic, characters."
msgstr ""
#. CLnAG
diff --git a/source/zh-CN/helpcontent2/source/text/swriter.po b/source/zh-CN/helpcontent2/source/text/swriter.po
index ae1a84cd8e7..2948ca45ac8 100644
--- a/source/zh-CN/helpcontent2/source/text/swriter.po
+++ b/source/zh-CN/helpcontent2/source/text/swriter.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-03-13 12:06+0100\n"
+"POT-Creation-Date: 2020-04-27 15:55+0200\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"
@@ -1123,15 +1123,6 @@ msgctxt ""
msgid "<link href=\"text/shared/01/06050000.xhp\" name=\"Numbering/Bullets\">Bullets and Numbering</link>"
msgstr "<link href=\"text/shared/01/06050000.xhp\" name=\"Numbering/Bullets\">项目符号与编号</link>"
-#. aLDgG
-#: main0105.xhp
-msgctxt ""
-"main0105.xhp\n"
-"hd_id3145692\n"
-"help.text"
-msgid "<link href=\"text/swriter/01/05040000.xhp\" name=\"Page\">Page</link>"
-msgstr "<link href=\"text/swriter/01/05040000.xhp\" name=\"Page\">页面</link>"
-
#. Sib7N
#: main0105.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/swriter/00.po b/source/zh-CN/helpcontent2/source/text/swriter/00.po
index ce738267453..f83796727ea 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: 2020-03-06 11:46+0100\n"
+"POT-Creation-Date: 2020-04-27 15:55+0200\n"
"PO-Revision-Date: 2019-07-10 01:38+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1537,13 +1537,13 @@ msgctxt ""
msgid "Choose <menuitem>Styles - Manage Styles</menuitem>"
msgstr ""
-#. GDexs
+#. THBBY
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3152947\n"
"help.text"
-msgid "Choose <menuitem>Format - Page</menuitem>."
+msgid "Choose <menuitem>Format - Page Style</menuitem>."
msgstr ""
#. 5B3jU
@@ -1591,14 +1591,14 @@ msgctxt ""
msgid "<variable id=\"spaltenber\">Choose <menuitem>Format - Sections - Options</menuitem> button.</variable>"
msgstr ""
-#. GqyGY
+#. w4TAg
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3150836\n"
"help.text"
-msgid "Choose <emph>Format - Page - Columns</emph> tab."
-msgstr "选择「<emph>格式 - 页面 - 列</emph>」选项卡。"
+msgid "Choose <emph>Format - Page Style - Columns</emph> tab."
+msgstr ""
#. 9F5Bz
#: 00000405.xhp
@@ -1636,14 +1636,14 @@ msgctxt ""
msgid "Choose <emph>Insert/Format - Section(s) - Columns</emph> tab."
msgstr "选择「<emph>插入/格式 - 区域 - 列</emph>」选项卡。"
-#. 2LmDy
+#. Gdf8J
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3149817\n"
"help.text"
-msgid "Choose <emph>Format - Page - Footnote</emph> tab."
-msgstr "选择「<emph>格式 - 页面 - 脚注</emph>」选项卡。"
+msgid "Choose <emph>Format - Page Style - Footnote</emph> tab."
+msgstr ""
#. CDmGU
#: 00000405.xhp
@@ -2545,14 +2545,14 @@ msgctxt ""
msgid "Frame Properties"
msgstr "框属性"
-#. bfpT5
+#. NAGGT
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3150140\n"
"help.text"
-msgid "Menu <emph>Format - Page</emph> - tab <emph>Text Grid</emph>, if Asian language support is enabled"
-msgstr "菜单「<emph>格式 - 页面</emph>」-「<emph>文字网格</emph>」选项卡,如果已启用亚洲语言支持"
+msgid "Menu <emph>Format - Page Style </emph> - tab <emph>Text Grid</emph>, if Asian language support is enabled"
+msgstr ""
#. aFWLc
#: 00000406.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/swriter/01.po b/source/zh-CN/helpcontent2/source/text/swriter/01.po
index 3e0226d7132..26088a9b3cf 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: 2020-04-08 14:22+0200\n"
+"POT-Creation-Date: 2020-04-27 15:55+0200\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"
@@ -15910,23 +15910,23 @@ msgctxt ""
msgid "Page Style"
msgstr "页面样式"
-#. Ez2SK
+#. AfM8s
#: 05040000.xhp
msgctxt ""
"05040000.xhp\n"
"hd_id3150016\n"
"help.text"
-msgid "Page Style"
-msgstr "页面样式"
+msgid "<link href=\"text/swriter/01/05040000.xhp\" name=\"Page Style\">Page Style</link>"
+msgstr ""
-#. gDHfG
+#. sJBg6
#: 05040000.xhp
msgctxt ""
"05040000.xhp\n"
"par_id3148774\n"
"help.text"
-msgid "<variable id=\"seitetext\"><ahelp hid=\".uno:PageDialog\">Specify the formatting styles and the layout for the current page style, including page margins, headers and footers, and the page background.</ahelp></variable>"
-msgstr "<variable id=\"seitetext\"><ahelp hid=\".uno:PageDialog\">指定当前页面样式的格式样式和版式,包括页边距、页眉、页脚和页面背景。</ahelp></variable>"
+msgid "<ahelp hid=\".uno:PageDialog\">Specify the formatting styles and the layout for the current page style, including page margins, headers and footers, and the page background.</ahelp>"
+msgstr ""
#. zsFam
#: 05040500.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/swriter/guide.po b/source/zh-CN/helpcontent2/source/text/swriter/guide.po
index ab303060797..5f3699c43e3 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-03-13 12:06+0100\n"
+"POT-Creation-Date: 2020-04-27 15:55+0200\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"
@@ -11653,14 +11653,14 @@ msgctxt ""
msgid "If your text document consists only of pages with the same page style, you can change the page properties directly:"
msgstr "如果您的文本文档只存在相同的一个页面样式,您可以直接改变页面属性:"
-#. acrHD
+#. GuYFH
#: pageorientation.xhp
msgctxt ""
"pageorientation.xhp\n"
"par_id5256508\n"
"help.text"
-msgid "Choose <emph>Format - Page</emph>."
-msgstr "选择「<emph>格式 - 页面</emph>」。"
+msgid "Choose <menuitem>Format - Page Style</menuitem>."
+msgstr ""
#. vVVCj
#: pageorientation.xhp
@@ -11842,14 +11842,14 @@ msgctxt ""
msgid "One Page Long Styles"
msgstr "单页样式"
-#. uX9ZG
+#. UptGH
#: pageorientation.xhp
msgctxt ""
"pageorientation.xhp\n"
"par_id5169225\n"
"help.text"
-msgid "A page style can be defined to span one page only. The “First Page” style is an example. You set this property by defining another page style to be the \"next style\", on the <item type=\"menuitem\">Format - Page - Organizer</item> tab page."
-msgstr "一个页面样式可以定义为仅涵盖一个页面。「首页」样式就是一个例子。您可以在「<item type=\"menuitem\">格式 - 页面 - 管理</item>」选项卡页面中通过将另一个页面样式定义为「下一个样式」样式来设置该属性。"
+msgid "A page style can be defined to span one page only. The “First Page” style is an example. You set this property by defining another page style to be the \"next style\", on the <menuitem>Format - Page Style - Organizer</menuitem> tab page."
+msgstr ""
#. BorA4
#: pageorientation.xhp
@@ -11878,14 +11878,14 @@ msgctxt ""
msgid "Manually Defined Range of a Page style"
msgstr "手动定义页面样式的区域"
-#. 4PsyS
+#. BCFqC
#: pageorientation.xhp
msgctxt ""
"pageorientation.xhp\n"
"par_id6386913\n"
"help.text"
-msgid "The “Default” page style does not set a different \"next style\" on the <item type=\"menuitem\">Format - Page - Organizer</item> tab page. Instead, the \"next style\" is set also to be “Default”. All page styles that are followed by the same page style can span multiple pages. The lower and upper borders of the page style range are defined by \"page breaks with style\". All the pages between any two \"page breaks with style\" use the same page style."
-msgstr "在「<item type=\"menuitem\">格式 - 页面 - 管理</item>」选项卡页面中,「默认」页面样式没有设置不同的「下一个样式」。或者说,「下一个样式」也设置为「默认」。采用相同页面样式的所有页码样式都能够涵盖多个页面。一个页面样式区域的上下边界由「带样式的分页符」定义。在任两个「带样式的分页符」之间的所有页面使用同一个页面样式。"
+msgid "The “Default” page style does not set a different \"next style\" on the <menuitem>Format - Page Style - Organizer</menuitem> tab page. Instead, the \"next style\" is set also to be “Default”. All page styles that are followed by the same page style can span multiple pages. The lower and upper borders of the page style range are defined by \"page breaks with style\". All the pages between any two \"page breaks with style\" use the same page style."
+msgstr ""
#. pyFgt
#: pageorientation.xhp