aboutsummaryrefslogtreecommitdiff
path: root/source/zh-CN/helpcontent2
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2021-10-04 21:18:14 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2021-10-04 21:20:50 +0200
commite8881fe8aa87f07547d433e9fbb82e0e768eb719 (patch)
treecd8841438ea6cd00c4047f486da01ebc6aaa781d /source/zh-CN/helpcontent2
parent0cb98568b1070b0178a398e2befd36808364e37e (diff)
update translations for master
and force-fix errors using pocheck Change-Id: I1658b92ce4e7a15ad5539e5dcba48bfd1951744f
Diffstat (limited to 'source/zh-CN/helpcontent2')
-rw-r--r--source/zh-CN/helpcontent2/source/text/sbasic/python.po32
-rw-r--r--source/zh-CN/helpcontent2/source/text/sbasic/shared.po112
-rw-r--r--source/zh-CN/helpcontent2/source/text/sbasic/shared/02.po8
-rw-r--r--source/zh-CN/helpcontent2/source/text/sbasic/shared/03.po38
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc.po30
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/01.po292
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/guide.po145
-rw-r--r--source/zh-CN/helpcontent2/source/text/sdatabase.po624
-rw-r--r--source/zh-CN/helpcontent2/source/text/sdraw.po32
-rw-r--r--source/zh-CN/helpcontent2/source/text/sdraw/00.po18
-rw-r--r--source/zh-CN/helpcontent2/source/text/sdraw/01.po54
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/01.po344
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/explorer/database.po602
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/guide.po118
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/menu.po38
-rw-r--r--source/zh-CN/helpcontent2/source/text/simpress/guide.po20
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/00.po8
17 files changed, 1352 insertions, 1163 deletions
diff --git a/source/zh-CN/helpcontent2/source/text/sbasic/python.po b/source/zh-CN/helpcontent2/source/text/sbasic/python.po
index 7600446e64e..80505cad051 100644
--- a/source/zh-CN/helpcontent2/source/text/sbasic/python.po
+++ b/source/zh-CN/helpcontent2/source/text/sbasic/python.po
@@ -4,16 +4,16 @@ 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: 2021-09-27 19:09+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"
-"Language: zh_CN\n"
+"PO-Revision-Date: 2021-09-30 02:36+0000\n"
+"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
+"Language-Team: Chinese (Simplified) <https://translations.documentfoundation.org/projects/libo_help-master/textsbasicpython/zh_Hans/>\n"
+"Language: zh-CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Accelerator-Marker: ~\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Weblate 4.8.1\n"
"X-POOTLE-MTIME: 1562722739.000000\n"
#. naSFZ
@@ -95,7 +95,7 @@ msgctxt ""
"tit\n"
"help.text"
msgid "Python to Basic"
-msgstr ""
+msgstr "从 Python 调用 BASIC"
#. dkYtk
#: python_2_basic.xhp
@@ -113,7 +113,7 @@ msgctxt ""
"N0331\n"
"help.text"
msgid "<variable id=\"py2ba_h1\"><link href=\"text/sbasic/python/python_2_basic.xhp\" name=\"Calling Basic macros from Python\">Calling Basic Macros from Python</link></variable>"
-msgstr ""
+msgstr "<variable id=\"py2ba_h1\"><link href=\"text/sbasic/python/python_2_basic.xhp\" name=\"从 Python 中调用 BASIC 宏\">从 Python 中调用 BASIC 宏</link></variable>"
#. XzJcA
#: python_2_basic.xhp
@@ -185,7 +185,7 @@ msgctxt ""
"N0339\n"
"help.text"
msgid "Retrieving %PRODUCTNAME Basic Scripts"
-msgstr ""
+msgstr "获取 %PRODUCTNAME BASIC 脚本"
#. yiTqz
#: python_2_basic.xhp
@@ -221,7 +221,7 @@ msgctxt ""
"N0363\n"
"help.text"
msgid "Executing %PRODUCTNAME Basic Scripts"
-msgstr ""
+msgstr "运行 %PRODUCTNAME BASIC 脚本"
#. GNDbf
#: python_2_basic.xhp
@@ -239,7 +239,7 @@ msgctxt ""
"N0364\n"
"help.text"
msgid "The %PRODUCTNAME Software Development Kit (SDK) documentation for <link href=\"https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1script_1_1provider_1_1XScript.html#a11a551f5a2520f74c5109cd8c9f8c7b7\" name=\"XScript interface\">com.sun.star.script.provider.XScript</link> interface details the calling convention for inter-language calls. Invocation of functions requires three arrays:"
-msgstr ""
+msgstr "%PRODUCTNAME 软件开发工具包 (SDK) 文档中的 <link href=\"https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1script_1_1provider_1_1XScript.html#a11a551f5a2520f74c5109cd8c9f8c7b7\" name=\"XScript 界面\">com.sun.star.script.provider.XScript</link> 界面部分详细描述了跨语言调用的约定。对函数的调用需要三个数组:"
#. UDhtt
#: python_2_basic.xhp
@@ -248,7 +248,7 @@ msgctxt ""
"N0365\n"
"help.text"
msgid "the first lists the arguments of the called routine"
-msgstr ""
+msgstr "第一个列出被调用函数的各参数"
#. A9CMY
#: python_2_basic.xhp
@@ -257,7 +257,7 @@ msgctxt ""
"N0366\n"
"help.text"
msgid "the second identifies modified arguments"
-msgstr ""
+msgstr "第二个标注会被改变的参数"
#. v3GcD
#: python_2_basic.xhp
@@ -266,7 +266,7 @@ msgctxt ""
"N0367\n"
"help.text"
msgid "the third stores the return values"
-msgstr ""
+msgstr "第三个存储返回值"
#. TeGwy
#: python_2_basic.xhp
@@ -275,7 +275,7 @@ msgctxt ""
"N0368\n"
"help.text"
msgid "Python Syntax"
-msgstr ""
+msgstr "Python 语法"
#. GXEC9
#: python_2_basic.xhp
@@ -311,7 +311,7 @@ msgctxt ""
"N0372\n"
"help.text"
msgid "Examples of Personal or Shared Scripts"
-msgstr ""
+msgstr "个人使用脚本或共享脚本的示例"
#. nyNGG
#: python_2_basic.xhp
@@ -338,7 +338,7 @@ msgctxt ""
"N0378\n"
"help.text"
msgid "Examples of Embedded Scripts in Documents"
-msgstr ""
+msgstr "嵌入到文档内脚本的示例"
#. EmqHD
#: python_2_basic.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/sbasic/shared.po b/source/zh-CN/helpcontent2/source/text/sbasic/shared.po
index 46b52777ec3..04e7e268138 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: 2021-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
"PO-Revision-Date: 2021-08-16 16:51+0000\n"
"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
"Language-Team: Chinese (Simplified) <https://translations.documentfoundation.org/projects/libo_help-master/textsbasicshared/zh_Hans/>\n"
@@ -38815,40 +38815,40 @@ msgctxt ""
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."
msgstr ""
-#. t97uD
+#. DeHMt
#: calc_functions.xhp
msgctxt ""
"calc_functions.xhp\n"
"tit\n"
"help.text"
-msgid "Calling Calc Functions in Macros"
+msgid "Using Calc Functions in Macros"
msgstr ""
-#. 3LfzE
+#. B2ErX
#: calc_functions.xhp
msgctxt ""
"calc_functions.xhp\n"
"bm_id291592361063458\n"
"help.text"
-msgid "<bookmark_value>calling Calc function;macros</bookmark_value> <bookmark_value>macros;calling Calc function</bookmark_value> <bookmark_value>createUNOservice function;calling Calc function</bookmark_value> <bookmark_value>API;sheet.addin.Analysis</bookmark_value> <bookmark_value>API;sheet.FunctionAccess</bookmark_value>"
+msgid "<bookmark_value>calling Calc function;macros</bookmark_value> <bookmark_value>setting Calc function;macros</bookmark_value> <bookmark_value>macros;calling Calc function</bookmark_value> <bookmark_value>macros;setting Calc function</bookmark_value> <bookmark_value>createUNOservice function;calling Calc function</bookmark_value> <bookmark_value>API;sheet.addin.Analysis</bookmark_value> <bookmark_value>API;sheet.FunctionAccess</bookmark_value>"
msgstr ""
-#. CSA8o
+#. oDKGc
#: calc_functions.xhp
msgctxt ""
"calc_functions.xhp\n"
"hd_id91592352089011\n"
"help.text"
-msgid "<variable id=\"CallingCalcFunctionsh1\"><link href=\"text/sbasic/shared/calc_functions.xhp\" name=\"Calling Calc Functions\">Calling Calc Functions</link></variable>"
+msgid "<variable id=\"CallingCalcFunctionsh1\"><link href=\"text/sbasic/shared/calc_functions.xhp\" name=\"Calling Calc Functions\">Using Calc Functions in Macros</link></variable>"
msgstr ""
-#. DeJyb
+#. vixak
#: calc_functions.xhp
msgctxt ""
"calc_functions.xhp\n"
"par_id1001592359117987\n"
"help.text"
-msgid "In addition to the native BASIC functions, you can call Calc functions in your macros and scripts."
+msgid "In addition to the native BASIC functions, you can call Calc functions in your macros and scripts and set Calc functions in cell formulas."
msgstr ""
#. pFoqw
@@ -38968,6 +38968,51 @@ msgctxt ""
msgid "' Shows the message \"Disagree\""
msgstr ""
+#. u8bVb
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"hd_id261632673377666\n"
+"help.text"
+msgid "Setting Cell Formulas Containing Internal Calc Functions"
+msgstr ""
+
+#. QAMok
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id41632673385259\n"
+"help.text"
+msgid "Use the formula text string to add a formula to a spreadsheet cell."
+msgstr ""
+
+#. o3jiB
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id291632673370039\n"
+"help.text"
+msgid "All Calc functions must be expressed with their English names."
+msgstr ""
+
+#. dfwfw
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id101632673833258\n"
+"help.text"
+msgid "REM Add a formula to cell A1. Function name must be in English."
+msgstr ""
+
+#. BcaTk
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id191632673837838\n"
+"help.text"
+msgid "REM Cell A1 displays the localized function name"
+msgstr ""
+
#. V3quU
#: calc_functions.xhp
msgctxt ""
@@ -38986,13 +39031,13 @@ msgctxt ""
msgid "The Calc Add-In functions are in service <literal>com.sun.star.sheet.addin.Analysis</literal>."
msgstr ""
-#. Yrje5
+#. 94wim
#: calc_functions.xhp
msgctxt ""
"calc_functions.xhp\n"
"bas_id421592358343633\n"
"help.text"
-msgid "REM Example calling Addin function SQRTPI"
+msgid "REM Example calling Add-in function SQRTPI"
msgstr ""
#. bFnDA
@@ -39013,6 +39058,51 @@ msgctxt ""
msgid "MySQRTPI = oService.getSqrtPi(arg)"
msgstr ""
+#. 4Rj5v
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"hd_id251632673972700\n"
+"help.text"
+msgid "Setting Cell Formulas with Add-In Functions"
+msgstr ""
+
+#. wPiTB
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id431632674656090\n"
+"help.text"
+msgid "The Add-In function must be expressed by its UNO service name."
+msgstr ""
+
+#. nUVAe
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id101632623833258\n"
+"help.text"
+msgid "REM Add an Add-In formula to cell A1. Function name is the UNO service name."
+msgstr ""
+
+#. Q6BTa
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id191632673867838\n"
+"help.text"
+msgid "REM Cell A1 displays the localized function name"
+msgstr ""
+
+#. mYEEy
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"hd_id661632676716180\n"
+"help.text"
+msgid "Add-In Functions UNO service Names"
+msgstr ""
+
#. PsFhU
#: calc_functions.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/sbasic/shared/02.po b/source/zh-CN/helpcontent2/source/text/sbasic/shared/02.po
index 58f9fee355c..42e49442e2c 100644
--- a/source/zh-CN/helpcontent2/source/text/sbasic/shared/02.po
+++ b/source/zh-CN/helpcontent2/source/text/sbasic/shared/02.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-10 23:11+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+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"
@@ -1177,14 +1177,14 @@ msgctxt ""
msgid "<image id=\"img_id3146921\" src=\"cmd/sc_radiobutton.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3146921\">Icon Option Button</alt></image>"
msgstr ""
-#. FWkY8
+#. FNGHF
#: 20000000.xhp
msgctxt ""
"20000000.xhp\n"
"par_id3153575\n"
"help.text"
-msgid "<ahelp hid=\".uno:Radiobutton\">Adds a button that allows a user to select from a number of options.</ahelp> Grouped option buttons must have consecutive tab indices. They are commonly encircled by a group box. If you have two groups of option buttons, you must insert a tab index between the tab indices of the two groups on the group frame."
-msgstr "<ahelp hid=\".uno:Radiobutton\">添加用于在多个选项中进行选择的按钮。</ahelp>分组单选按钮的选项卡索引必须连续,它们周围通常会有一个组框。如果有两组单选按钮,则需要在组框上两个组的选项卡索引之间再插入一个选项卡索引。"
+msgid "<ahelp hid=\".uno:Radiobutton\">Adds a button that allows a user to select from a number of options.</ahelp> Grouped option buttons must have consecutive tab order. They are commonly encircled by a group box. If you have two groups of option buttons, you must insert a tab order between the tab orders of the two groups. For example, to the frame of the second group, or to any other control in the dialog, with the exception of another option button."
+msgstr ""
#. DaRgN
#: 20000000.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/sbasic/shared/03.po b/source/zh-CN/helpcontent2/source/text/sbasic/shared/03.po
index 53324aef5cc..75d5b044189 100644
--- a/source/zh-CN/helpcontent2/source/text/sbasic/shared/03.po
+++ b/source/zh-CN/helpcontent2/source/text/sbasic/shared/03.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: 2021-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
"PO-Revision-Date: 2019-06-02 01:18+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17170,6 +17170,33 @@ msgctxt ""
msgid "The name of the currently logged user."
msgstr ""
+#. 9aGdF
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id561633021747903\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. yuuvA
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id201633021748455\n"
+"help.text"
+msgid "String array"
+msgstr ""
+
+#. BvYt3
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id831633021749007\n"
+"help.text"
+msgid "Returns a zero-based array of strings containing the names of all available fonts."
+msgstr ""
+
#. Dt7J5
#: sf_platform.xhp
msgctxt ""
@@ -17359,6 +17386,15 @@ msgctxt ""
msgid "This property may return the same value as the <literal>Machine</literal> property."
msgstr ""
+#. FJs9t
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id311633022159446\n"
+"help.text"
+msgid "The following examples in Basic and Python illustrate how to use the <literal>Fonts</literal> property to write the names of all available fonts to the current Calc sheet starting at cell \"A1\":"
+msgstr ""
+
#. 3yeMr
#: sf_platform.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/scalc.po b/source/zh-CN/helpcontent2/source/text/scalc.po
index bd5ecd1b261..ad206f5e328 100644
--- a/source/zh-CN/helpcontent2/source/text/scalc.po
+++ b/source/zh-CN/helpcontent2/source/text/scalc.po
@@ -3,9 +3,9 @@ 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: 2021-02-08 12:09+0100\n"
-"PO-Revision-Date: 2021-07-28 09:59+0000\n"
-"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
+"PO-Revision-Date: 2021-10-04 18:05+0000\n"
+"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: Chinese (Simplified) <https://translations.documentfoundation.org/projects/libo_help-master/textscalc/zh_Hans/>\n"
"Language: zh-CN\n"
"MIME-Version: 1.0\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Accelerator-Marker: ~\n"
-"X-Generator: Weblate 4.6.2\n"
+"X-Generator: LibreOffice\n"
"X-POOTLE-MTIME: 1562722719.000000\n"
#. ZxQeC
@@ -221,7 +221,7 @@ msgctxt ""
"hd_id10272015110909623\n"
"help.text"
msgid "View Grid lines"
-msgstr ""
+msgstr "查看网格线"
#. TvxiA
#: main0103.xhp
@@ -266,7 +266,7 @@ msgctxt ""
"hd_id102720151147488697\n"
"help.text"
msgid "<embedvar href=\"text/scalc/01/04080000.xhp#function_list_title\"/>"
-msgstr ""
+msgstr "<embedvar href=\"text/scalc/01/04080000.xhp#function_list_title\"/>"
#. f3nqY
#: main0103.xhp
@@ -439,15 +439,6 @@ msgctxt ""
msgid "<link href=\"text/scalc/01/05020000.xhp\" name=\"Cells\">Cells</link>"
msgstr "<link href=\"text/scalc/01/05020000.xhp\" name=\"Cells\">单元格</link>"
-#. FuTAK
-#: main0105.xhp
-msgctxt ""
-"main0105.xhp\n"
-"hd_id3155087\n"
-"help.text"
-msgid "<link href=\"text/scalc/01/05070000.xhp\" name=\"Page\">Page</link>"
-msgstr "<link href=\"text/scalc/01/05070000.xhp\" name=\"Page\">页面</link>"
-
#. 2T8EY
#: main0105.xhp
msgctxt ""
@@ -637,6 +628,15 @@ msgctxt ""
msgid "<ahelp hid=\".\">Use the <emph>Data</emph> menu commands to edit the data in the current sheet. You can define ranges, sort and filter the data, calculate results, outline data, and create a pivot table.</ahelp>"
msgstr "<ahelp hid=\".\">使用「<emph>数据</emph>」菜单命令编辑当前工作表中的数据。您可以定义区域、排序和筛选数据、计算结果、进行数据分组和创建透视表。</ahelp>"
+#. BDFbQ
+#: main0112.xhp
+msgctxt ""
+"main0112.xhp\n"
+"hd_id231633127579389\n"
+"help.text"
+msgid "<link href=\"text/scalc/01/live_data_stream.xhp\" name=\"Streams_link\">Streams</link>"
+msgstr ""
+
#. efuyu
#: main0116.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/01.po b/source/zh-CN/helpcontent2/source/text/scalc/01.po
index de2faade4cf..5b09a98d845 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: 2021-09-20 13:02+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
"PO-Revision-Date: 2021-05-31 13:28+0000\n"
"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
"Language-Team: Chinese (Simplified) <https://translations.documentfoundation.org/projects/libo_help-master/textscalc01/zh_Hans/>\n"
@@ -14938,13 +14938,13 @@ msgctxt ""
msgid "<ahelp hid=\".\">Converts to euros a currency value expressed in one of the legacy currencies of 19 member states of the European Union, and vice versa.</ahelp> The conversion uses the fixed exchange rates at which the legacy currencies entered the euro."
msgstr ""
-#. 5TXaB
+#. ikuav
#: 04060106.xhp
msgctxt ""
"04060106.xhp\n"
"par_id581631900947319\n"
"help.text"
-msgid "We recommend using the more flexible EUROCONVERT function for converting between these currencies."
+msgid "We recommend using the more flexible EUROCONVERT function for converting between these currencies. For converting between many different units of measure, use the CONVERT function."
msgstr ""
#. ETLYS
@@ -19060,14 +19060,14 @@ msgctxt ""
msgid "If Type = 0, only exact matches are found. If the search criterion is found more than once, the function returns the index of the first matching value. Only if Type = 0 can you search for regular expressions (if enabled in calculation options) or wildcards (if enabled in calculation options)."
msgstr "如果 type=0,仅查找完全匹配的内容。如果查找条件多次找到,则函数返回第一个匹配值的索引。只有在 Type = 0 时才允许通过正则表达式 (如果在计算选项中启用) 或通配符 (如果在计算选项中启用) 进行搜索。"
-#. kxGzq
+#. t3Ems
#: 04060109.xhp
msgctxt ""
"04060109.xhp\n"
"par_id3147528\n"
"help.text"
-msgid "If Type = 1 or the third parameter is missing, the index of the last value that is smaller or equal to the search criterion is returned. This applies even when the search array is not sorted. For Type = -1, the first value that is larger or equal is returned."
-msgstr "如果 Type = 1 或者 未指定第三个参数,将返回最后一个小于或等于查找条件的数值。即使查找的数组未排序也同样适用。对于 Type = -1,将返回第一个大于或等于查找条件的数值。"
+msgid "If Type = 1 or the third parameter is missing, the index of the last value that is smaller or equal to the search criterion is returned. For Type = -1, the first value that is larger or equal is returned."
+msgstr ""
#. eFMjk
#: 04060109.xhp
@@ -44197,50 +44197,149 @@ msgctxt ""
msgid "Merge and Center Cells"
msgstr "合并并居中单元格"
-#. d7KhY
+#. yCXuu
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"bm_id501632012952361\n"
+"help.text"
+msgid "<bookmark_value>toggle merge and center cells</bookmark_value>"
+msgstr ""
+
+#. CQ5ZE
#: 05060000.xhp
msgctxt ""
"05060000.xhp\n"
"hd_id3149785\n"
"help.text"
-msgid "<link href=\"text/scalc/01/05060000.xhp\" name=\"Merge and Center Cells\">Merge and Center Cells</link>"
-msgstr "<link href=\"text/scalc/01/05060000.xhp\" name=\"合并并居中单元格\">合并并居中单元格</link>"
+msgid "<variable id=\"togglemergecells\"><link href=\"text/scalc/01/05060000.xhp\" name=\"Merge and Center Cells\">Merge and Center Cells</link></variable>"
+msgstr ""
-#. DaWoE
+#. 8qb5f
#: 05060000.xhp
msgctxt ""
"05060000.xhp\n"
"par_id3151246\n"
"help.text"
-msgid "<ahelp hid=\".\">Combines the selected cells into a single cell or splits merged cells. Aligns cell content centered.</ahelp>"
-msgstr "<ahelp hid=\".\">将选中单元格合并为一个,或拆分已合并的单元格。单元格内容居中排列。</ahelp>"
+msgid "<ahelp hid=\".\">This is a toggleable control that joins all cells in a rectangular selection into a single cell, or returns merged cells to the original individual cells. When merging it will format the merged cell as center aligned.</ahelp>"
+msgstr ""
+
+#. b63oA
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id541633057818950\n"
+"help.text"
+msgid "The control is shown toggled-on whenever there are merged cells in the selection, indicating that clicking the control will unmerge those cells."
+msgstr ""
+
+#. MiEGm
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id3153718\n"
+"help.text"
+msgid "Merging cells can lead to calculation errors in formulas in the table."
+msgstr "合并单元格可能会导致表格中公式计算出错。"
+
+#. fBfnU
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id441632808439621\n"
+"help.text"
+msgid "Do one of the following:"
+msgstr ""
+
+#. bnEwD
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id691632803588118\n"
+"help.text"
+msgid "In the <emph>Formatting</emph> toolbar, click:"
+msgstr ""
+
+#. sq4wv
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id521632804983642\n"
+"help.text"
+msgid "<image id=\"img_id811632804983642\" src=\"cmd/sc_togglemergecells.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id921632804983642\">Icon</alt> </image>"
+msgstr ""
+
+#. 86yef
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id491632804983642\n"
+"help.text"
+msgid "Merge and Center Cells"
+msgstr ""
-#. XHEBx
+#. ZRQSQ
#: 05060000.xhp
msgctxt ""
"05060000.xhp\n"
"par_id3154020\n"
"help.text"
-msgid "Choose <emph>Format - Merge Cells - Merge and Center Cells</emph>"
-msgstr "选择「<emph>格式 - 合并单元格 - 合并并居中单元格</emph>」"
+msgid "Or, choose <variable id=\"format_mergecells_menu\"><menuitem>Format - Merge and Unmerge Cells - </menuitem></variable><menuitem> Merge and Center Cells</menuitem>."
+msgstr ""
+
+#. 8zues
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id3149665\n"
+"help.text"
+msgid "Cells cannot be merged again without first unmerging them."
+msgstr ""
-#. rpUVk
+#. Dybs6
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id581632979766784\n"
+"help.text"
+msgid "Merging a cell selection that partially includes merged cells is generally possible with <emph>Unmerge Cells</emph> followed by <emph>Merge Cells</emph>, without altering the initial selection. The result will be largely depend on previous choices when merging cells made with the <emph>Merge Cells Dialog</emph> options described below."
+msgstr ""
+
+#. wNBDD
#: 05060000.xhp
msgctxt ""
"05060000.xhp\n"
"par_id3148552\n"
"help.text"
-msgid "The merged cell receives the name of the first cell of the original cell range. Merged cells cannot be merged a second time with other cells. The range must form a rectangle, multiple selection is not supported."
-msgstr "合并后的单元格地址取自合并前单元格区域第一个单元格的地址。合并后的单元格不能再与其它单元格进行合并。单元格区域只能是一个矩形。"
+msgid "Multiple selection is not supported, that is, the selection must be rectangular."
+msgstr ""
-#. HQCwU
+#. XB4aH
#: 05060000.xhp
msgctxt ""
"05060000.xhp\n"
-"par_id3149665\n"
+"par_id211632985508898\n"
"help.text"
-msgid "If the cells to be merged have any contents, a security dialog is shown."
-msgstr "如果要合并的单元格包含内容,将显示一个警告对话框。"
+msgid "The merged cell receives the name and content of the first cell of the selection."
+msgstr ""
+
+#. XRBDv
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id271632985709781\n"
+"help.text"
+msgid "If more than one cell to be merged has content the <emph>Merge Cells</emph> dialog opens."
+msgstr ""
+
+#. QWjJw
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id391632360383197\n"
+"help.text"
+msgid "Merge Cells Dialog Options"
+msgstr ""
#. LBMEE
#: 05060000.xhp
@@ -44278,15 +44377,6 @@ msgctxt ""
msgid "<emph>Empty the contents of the hidden cells</emph>: <ahelp hid=\".\">The contents of the hidden cells are removed; the results of formulas referring to the hidden cells will be updated.</ahelp>"
msgstr "「<emph>清空隐藏单元格的内容</emph>」: <ahelp hid=\".\">隐藏单元格的内容将被删除; 引用隐藏单元格的公式的结果将会更新。</ahelp>"
-#. MiEGm
-#: 05060000.xhp
-msgctxt ""
-"05060000.xhp\n"
-"par_id3153718\n"
-"help.text"
-msgid "Merging cells can lead to calculation errors in formulas in the table."
-msgstr "合并单元格可能会导致表格中公式计算出错。"
-
#. b8c8c
#: 05070000.xhp
msgctxt ""
@@ -44305,14 +44395,14 @@ msgctxt ""
msgid "<bookmark_value>style;page</bookmark_value><bookmark_value>page;style</bookmark_value><bookmark_value>format;page</bookmark_value><bookmark_value>formatting;page</bookmark_value>"
msgstr ""
-#. YjqDi
+#. Rpt6B
#: 05070000.xhp
msgctxt ""
"05070000.xhp\n"
"hd_id3157910\n"
"help.text"
-msgid "Page Style"
-msgstr "页面样式"
+msgid "<link href=\"text/scalc/01/05070000.xhp\" name=\"Page Style\">Page Style</link>"
+msgstr ""
#. 4vJrN
#: 05070000.xhp
@@ -44584,23 +44674,23 @@ msgctxt ""
msgid "First page number"
msgstr "第一个页码"
-#. zJPaa
+#. oAziQ
#: 05070500.xhp
msgctxt ""
"05070500.xhp\n"
"par_id3155378\n"
"help.text"
-msgid "<ahelp hid=\"modules/scalc/ui/sheetprintpage/checkBTN_PAGENO\">Select this option if you want the first page to start with a number other than 1.</ahelp>"
-msgstr "<ahelp hid=\"modules/scalc/ui/sheetprintpage/checkBTN_PAGENO\">如果您希望首页的页码不是 1,则选择此选项。</ahelp>"
+msgid "<ahelp hid=\"modules/scalc/ui/sheetprintpage/checkBTN_PAGENO\">Select this option if you want this style to restart page numbering.</ahelp>"
+msgstr ""
-#. AG8hs
+#. gVwLk
#: 05070500.xhp
msgctxt ""
"05070500.xhp\n"
"par_id3145389\n"
"help.text"
-msgid "<ahelp hid=\"modules/scalc/ui/sheetprintpage/spinED_PAGENO\">Enter the number of the first page.</ahelp>"
-msgstr "<ahelp hid=\"modules/scalc/ui/sheetprintpage/spinED_PAGENO\">输入首页的编号。</ahelp>"
+msgid "<ahelp hid=\"modules/scalc/ui/sheetprintpage/spinED_PAGENO\">Enter the number you want to restart at.</ahelp>"
+msgstr ""
#. V6Y9R
#: 05070500.xhp
@@ -44908,14 +44998,14 @@ msgctxt ""
msgid "Edit Print Ranges"
msgstr "编辑打印范围"
-#. QueLv
+#. JfwDe
#: 05080300.xhp
msgctxt ""
"05080300.xhp\n"
"par_id3159488\n"
"help.text"
-msgid "<variable id=\"druckbereichetext\"><ahelp hid=\".uno:EditPrintArea\">Opens a dialog where you can specify the print range.</ahelp></variable> You can also set the rows or columns which are to be repeated in every page."
-msgstr "<variable id=\"druckbereichetext\"><ahelp hid=\".uno:EditPrintArea\">打开一个对话框,您可以指定打印区域。</ahelp></variable>您也可以设置要在每页重复打印的行或列。"
+msgid "<variable id=\"printrangestext\"><ahelp hid=\".uno:EditPrintArea\">Opens a dialog where you can specify the print range.</ahelp></variable> You can also set the rows or columns which are to be repeated in every page."
+msgstr ""
#. eja4j
#: 05080300.xhp
@@ -45367,78 +45457,6 @@ msgctxt ""
msgid "<ahelp hid=\"SFX2_HID_TEMPLATE_FILTER\">Lists the available style groups.</ahelp>"
msgstr "<ahelp hid=\"SFX2_HID_TEMPLATE_FILTER\">列出可用的样式组合。</ahelp>"
-#. Gmpzb
-#: 05100100.xhp
-msgctxt ""
-"05100100.xhp\n"
-"tit\n"
-"help.text"
-msgid "Merge Cells"
-msgstr "合并单元格"
-
-#. 4JtKL
-#: 05100100.xhp
-msgctxt ""
-"05100100.xhp\n"
-"hd_id3154765\n"
-"help.text"
-msgid "Merge Cells"
-msgstr "合并单元格"
-
-#. BHmTE
-#: 05100100.xhp
-msgctxt ""
-"05100100.xhp\n"
-"par_id3147406\n"
-"help.text"
-msgid "<ahelp hid=\".\">Combines the contents of the selected cells into a single cell.</ahelp>"
-msgstr "<ahelp hid=\".\">将选中单元格的内容合并到一个单元格当中。</ahelp>"
-
-#. AP2s7
-#: 05100100.xhp
-msgctxt ""
-"05100100.xhp\n"
-"par_id3154351\n"
-"help.text"
-msgid "Choose <emph>Format - Merge Cells - Merge Cells</emph>"
-msgstr "选择「<emph>格式 - 合并单元格 - 合并单元格</emph>」"
-
-#. pfYCj
-#: 05100200.xhp
-msgctxt ""
-"05100200.xhp\n"
-"tit\n"
-"help.text"
-msgid "Split Cells"
-msgstr "拆分单元格"
-
-#. ZTsK9
-#: 05100200.xhp
-msgctxt ""
-"05100200.xhp\n"
-"hd_id3154654\n"
-"help.text"
-msgid "Split Cells"
-msgstr "拆分单元格"
-
-#. omMdA
-#: 05100200.xhp
-msgctxt ""
-"05100200.xhp\n"
-"par_id3083451\n"
-"help.text"
-msgid "<ahelp hid=\".\">Splits previously merged cells.</ahelp>"
-msgstr "<ahelp hid=\".\">拆分之前合并的单元格。</ahelp>"
-
-#. ic7Vk
-#: 05100200.xhp
-msgctxt ""
-"05100200.xhp\n"
-"par_id3154023\n"
-"help.text"
-msgid "Choose <emph>Format - Merge Cells - Split Cells</emph>"
-msgstr "选择「<emph>格式 - 合并单元格 - 拆分单元格</emph>」"
-
#. MiWuG
#: 05110000.xhp
msgctxt ""
@@ -48688,22 +48706,22 @@ msgctxt ""
msgid "<ahelp hid=\"modules/scalc/ui/sortoptionspage/leftright\"> Sorts columns by the values in the active rows of the selected range.</ahelp>"
msgstr "<ahelp hid=\"modules/scalc/ui/sortoptionspage/leftright\"> 在选中范围内,按照活动行中的值对列进行排序。</ahelp>"
-#. a8dw2
+#. MzEHk
#: 12040000.xhp
msgctxt ""
"12040000.xhp\n"
"tit\n"
"help.text"
-msgid "Filter"
-msgstr "筛选器"
+msgid "More Filters"
+msgstr ""
-#. A3xBE
+#. EtYTd
#: 12040000.xhp
msgctxt ""
"12040000.xhp\n"
"hd_id3150767\n"
"help.text"
-msgid "<link href=\"text/scalc/01/12040000.xhp\" name=\"Filter\">Filters</link>"
+msgid "<link href=\"text/scalc/01/12040000.xhp\" name=\"Filter\">More Filters</link>"
msgstr ""
#. PgpNB
@@ -48715,14 +48733,14 @@ msgctxt ""
msgid "<ahelp hid=\".\">Shows commands to filter your data.</ahelp>"
msgstr "<ahelp hid=\".\">显示可以用于筛选数据的命令。</ahelp>"
-#. ipXuZ
+#. nGCni
#: 12040000.xhp
msgctxt ""
"12040000.xhp\n"
-"par_id3146119\n"
+"par_id911633127394220\n"
"help.text"
-msgid "$[officename] automatically recognizes predefined database ranges."
-msgstr "$[officename] 可以自动识别预设的数据库区域。"
+msgid "%PRODUCTNAME automatically recognizes predefined database ranges."
+msgstr ""
#. 7khnq
#: 12040000.xhp
@@ -67183,14 +67201,14 @@ msgctxt ""
msgid "Live Data Stream"
msgstr "实时数据流"
-#. iithi
+#. GvEyi
#: live_data_stream.xhp
msgctxt ""
"live_data_stream.xhp\n"
"bm_id240920171018528200\n"
"help.text"
-msgid "<bookmark_value>Data Stream;Live data stream</bookmark_value>"
-msgstr "<bookmark_value>数据流;实时数据流</bookmark_value>"
+msgid "<bookmark_value>Data Stream;Live data stream</bookmark_value> <bookmark_value>Data Stream;Streams</bookmark_value>"
+msgstr ""
#. bn3r4
#: live_data_stream.xhp
@@ -67201,32 +67219,32 @@ msgctxt ""
msgid "<link href=\"text/scalc/01/live_data_stream.xhp\">Live Data Stream</link>"
msgstr "<link href=\"text/scalc/01/live_data_stream.xhp\">实时数据流</link>"
-#. mND9J
+#. mB9BH
#: live_data_stream.xhp
msgctxt ""
"live_data_stream.xhp\n"
"par_id240920171003293400\n"
"help.text"
-msgid "<ahelp hid=\".\">Live data stream for spreadsheets</ahelp>"
-msgstr "<ahelp hid=\".\">用于电子表格的实时数据流</ahelp>"
+msgid "<ahelp hid=\".\"><variable id=\"streams_desc\">Create live data streams for spreadsheets.</variable></ahelp>"
+msgstr ""
-#. DBAjA
+#. Zsu3z
#: live_data_stream.xhp
msgctxt ""
"live_data_stream.xhp\n"
"par_id240920171007389295\n"
"help.text"
-msgid "Menu <item type=\"menuitem\">Data – Streams...</item>"
-msgstr "菜单「<item type=\"menuitem\">数据 – 流...</item>」"
+msgid "Menu <menuitem>Data – Streams...</menuitem>"
+msgstr ""
-#. FYDzo
+#. JT47J
#: live_data_stream.xhp
msgctxt ""
"live_data_stream.xhp\n"
-"par_id240920171007419799\n"
+"par_id921633126951835\n"
"help.text"
-msgid "Data streams"
-msgstr "数据流"
+msgid "This is an experimental feature and is disabled by default. To enable it, go to <menuitem>Tools - Options - Advanced</menuitem> and check the option <emph>Enable experimental features (may be unstable)</emph>."
+msgstr ""
#. k7H5Y
#: solver.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/guide.po b/source/zh-CN/helpcontent2/source/text/scalc/guide.po
index 340827e19a8..17c3729b4ce 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: 2021-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+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"
@@ -12058,41 +12058,41 @@ msgctxt ""
msgid "<link href=\"text/shared/01/05020500.xhp\" name=\"Context menu - Character - Font Position\">Context menu - Character - Font Position</link>"
msgstr "<link href=\"text/shared/01/05020500.xhp\" name=\"右键菜单 - 字符 - 字体位置\">右键菜单 - 字符 - 字体位置</link>"
-#. 6YCYG
+#. 2wVQM
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"tit\n"
"help.text"
-msgid "Merging and Splitting Cells"
-msgstr "合并和拆分单元格"
+msgid "Merge and Unmerge Cells"
+msgstr ""
-#. v5UNn
+#. AEABz
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
-"bm_id3147240\n"
+"bm_id501632012952361\n"
"help.text"
-msgid "<bookmark_value>cells; merging/unmerging</bookmark_value> <bookmark_value>tables; merging cells</bookmark_value> <bookmark_value>cell merges</bookmark_value> <bookmark_value>unmerging cells</bookmark_value> <bookmark_value>splitting cells</bookmark_value> <bookmark_value>merging;cells</bookmark_value>"
-msgstr "<bookmark_value>单元格; 合并/拆分</bookmark_value> <bookmark_value>表格; 合并单元格</bookmark_value> <bookmark_value>单元格合并</bookmark_value> <bookmark_value>单元格拆分</bookmark_value> <bookmark_value>拆分单元格</bookmark_value> <bookmark_value>合并;单元格</bookmark_value>"
+msgid "<bookmark_value>merge/merging cells</bookmark_value> <bookmark_value>unmerge/unmerging cells</bookmark_value> <bookmark_value>split/splitting cells</bookmark_value>"
+msgstr ""
-#. 5x2y9
+#. BAqR3
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"hd_id8005005\n"
"help.text"
-msgid "<variable id=\"table_cellmerge\"><link href=\"text/scalc/guide/table_cellmerge.xhp\" name=\"Merging and Unmerging Cells\">Merging and Unmerging Cells</link></variable>"
-msgstr "<variable id=\"table_cellmerge\"><link href=\"text/scalc/guide/table_cellmerge.xhp\" name=\"合并和取消合并单元格\">合并和取消合并单元格</link></variable>"
+msgid "<variable id=\"table_cellmerge\"><link href=\"text/scalc/guide/table_cellmerge.xhp\" name=\"Merging and Unmerging Cells\">Merge and Unmerge Cells</link></variable>"
+msgstr ""
-#. HBXMn
+#. Hht67
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"par_id8049867\n"
"help.text"
-msgid "You can select adjacent cells, then merge them into a single cell. Conversely, you can take a large cell that has been created by merging single cells, and divide it back into individual cells."
-msgstr "可以选择相邻的单元格,然后将这些单元格合并为一个单元格。相反,也可以选择一个通过合并单个单元格而生成的大单元格,然后重新将其拆分为单个的单元格。"
+msgid "You can select a range of cells, then merge them into a single cell. Conversely, you can take a previously merged cell and divide it back into individual cells."
+msgstr ""
#. vFF3v
#: table_cellmerge.xhp
@@ -12103,59 +12103,140 @@ msgctxt ""
msgid "When you copy cells into a target range containing merged cells, the target range gets unmerged first, then the copied cells are pasted in. If the copied cells are merged cells, they retain their merge state."
msgstr "在将单元格复制到包含合并的单元格的目标区域时,目标区域首先会取消合并,然后将复制的单元格粘贴在其中。如果复制的单元格为合并的单元格,则这些单元格会保持其合并状态。"
-#. 8fYAs
+#. F4ADr
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"hd_id235602\n"
"help.text"
-msgid "Merging Cells"
-msgstr "合并单元格"
+msgid "Merge Cells"
+msgstr ""
-#. rg5VD
+#. PhwAW
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"par_id1272927\n"
"help.text"
-msgid "Select the adjacent cells."
-msgstr "选择相邻单元格。"
+msgid "Click and drag to select the cells to be merged then do one of the following:"
+msgstr ""
-#. tw3g2
+#. BpCih
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id221632803290526\n"
+"help.text"
+msgid "In the Formatting toolbar click:"
+msgstr ""
+
+#. tc6Dw
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id3154351\n"
+"help.text"
+msgid "Or, right click the selection to open the context menu and choose <menuitem>Merge Cells</menuitem>.<br/>If <menuitem>Unmerge Cells</menuitem> is present instead then the cell selection contains merged cells and cannot be merged further."
+msgstr ""
+
+#. uH6dA
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id931632803442925\n"
+"help.text"
+msgid "Or, in the <emph>Properties</emph> sidebar mark the <emph>Merge Cells</emph> checkbox."
+msgstr ""
+
+#. dzAEu
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id3154020\n"
+"help.text"
+msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Merge Cells</menuitem>"
+msgstr ""
+
+#. DbZBM
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"par_id6424146\n"
"help.text"
-msgid "Choose <emph>Format - Merge Cells - Merge Cells</emph>. If you choose <emph>Format - Merge Cells - Merge and Center Cells</emph>, the cell content will be centered in the merged cell."
-msgstr "选择「<emph>格式 - 合并单元格 - 合并单元格</emph>」。如果您选择「<emph>格式 - 合并单元格 - 合并并居中单元格</emph>」,单元格内容会被居中在合并后的单元格中。"
+msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Merge and Center Cells</menuitem>"
+msgstr ""
-#. sRSSD
+#. sHLpi
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id961632012538771\n"
+"help.text"
+msgid "The cells will be merged and the content will be centered in the merged cell."
+msgstr ""
+
+#. ULMQA
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"hd_id451368\n"
"help.text"
-msgid "Splitting Cells"
-msgstr "拆分单元格"
+msgid "Unmerge Cells"
+msgstr ""
-#. HBYzb
+#. 2xrnM
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"par_id7116611\n"
"help.text"
-msgid "Place the cursor in the cell to be split."
-msgstr "将光标放在要拆分的单元格中。"
+msgid "Select the cell to be unmerged, or a selection that includes the cells to be unmerged then do one of the following:"
+msgstr ""
+
+#. CmALo
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id581632820903635\n"
+"help.text"
+msgid "In the Formatting toolbar, click:"
+msgstr ""
+
+#. 4TYCy
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id431632277778130\n"
+"help.text"
+msgid "Or, right click the selection to open the context menu and choose <menuitem>Unmerge Cells</menuitem>.<br/>If <menuitem>Merge Cells</menuitem> is present instead then the selection does not contain any merged cells."
+msgstr ""
+
+#. LrAis
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id261632277824041\n"
+"help.text"
+msgid "Or, in the <emph>Properties</emph> sidebar clear the <emph>Merge Cells</emph> checkbox."
+msgstr ""
-#. 3iQKf
+#. zBdRG
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"par_id9493087\n"
"help.text"
-msgid "Choose <emph>Format - Merge Cells - Split Cells</emph>."
-msgstr "选择「<emph>格式 - 合并单元格 - 拆分单元格</emph>」。"
+msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Unmerge Cells</menuitem>."
+msgstr ""
+
+#. YC7sa
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id561632820960500\n"
+"help.text"
+msgid "Or, toggle <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Merge and Center Cells</menuitem>"
+msgstr ""
#. u5xXE
#: table_rotate.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/sdatabase.po b/source/zh-CN/helpcontent2/source/text/sdatabase.po
index 3f4b998ea28..936886d32b2 100644
--- a/source/zh-CN/helpcontent2/source/text/sdatabase.po
+++ b/source/zh-CN/helpcontent2/source/text/sdatabase.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: 2021-09-10 23:11+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
"PO-Revision-Date: 2021-08-30 13:40+0000\n"
"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
"Language-Team: Chinese (Simplified) <https://translations.documentfoundation.org/projects/libo_help-master/textsdatabase/zh_Hans/>\n"
@@ -6063,13 +6063,13 @@ msgctxt ""
msgid "Special Settings"
msgstr ""
-#. JBUZ3
+#. pCkAh
#: dabaadvpropdat.xhp
msgctxt ""
"dabaadvpropdat.xhp\n"
"bm_id81623155177507\n"
"help.text"
-msgid "<bookmark_value>database;special settings</bookmark_value> <bookmark_value>database settings;SQL92 naming</bookmark_value> <bookmark_value>database settings;keyword AS</bookmark_value> <bookmark_value>database settings;outer join syntax</bookmark_value> <bookmark_value>database settings;special SELECT statements</bookmark_value> <bookmark_value>database settings;ODBC date/time</bookmark_value> <bookmark_value>database settings;support primary keys</bookmark_value> <bookmark_value>database settings;line ends</bookmark_value> <bookmark_value>database settings;version columns</bookmark_value>"
+msgid "<bookmark_value>database;special settings</bookmark_value><bookmark_value>database settings;SQL92 naming</bookmark_value><bookmark_value>database settings;keyword AS</bookmark_value><bookmark_value>database settings;outer join syntax</bookmark_value><bookmark_value>database settings;special SELECT statements</bookmark_value><bookmark_value>database settings;ODBC date/time</bookmark_value><bookmark_value>database settings;support primary keys</bookmark_value><bookmark_value>database settings;line ends</bookmark_value><bookmark_value>database settings;version columns</bookmark_value>"
msgstr ""
#. vCApF
@@ -6126,58 +6126,40 @@ msgctxt ""
msgid "<ahelp hid=\".\">Only allows characters that conform to the SQL92 naming convention in a name in a data source. All other characters are rejected. Each name must begin with a lowercase letter, an uppercase letter, or an underscore ( _ ). The remaining characters can be ASCII letters, numbers, and underscores.</ahelp>"
msgstr ""
-#. wHaBn
-#: dabaadvpropdat.xhp
-msgctxt ""
-"dabaadvpropdat.xhp\n"
-"par_idN105907\n"
-"help.text"
-msgid "Use keyword AS before table alias names"
-msgstr ""
-
-#. xEpbm
-#: dabaadvpropdat.xhp
-msgctxt ""
-"dabaadvpropdat.xhp\n"
-"par_idN105947\n"
-"help.text"
-msgid "<ahelp hid=\".\">Some databases use the keyword \"AS\" between a name and its alias, while other databases use a whitespace. Enable this option to insert AS before the alias.</ahelp>"
-msgstr ""
-
-#. NbAt4
+#. UDWZ7
#: dabaadvpropdat.xhp
msgctxt ""
"dabaadvpropdat.xhp\n"
-"hd_id3534958\n"
+"par_idN1059E\n"
"help.text"
-msgid "End text lines with CR + LF"
+msgid "Append the table alias name in SELECT statements"
msgstr ""
-#. NKKsC
+#. v2ZEZ
#: dabaadvpropdat.xhp
msgctxt ""
"dabaadvpropdat.xhp\n"
-"par_id6151921\n"
+"par_idN105A2\n"
"help.text"
-msgid "<ahelp hid=\".\">Select to use the CR + LF code pair to end every text line (preferred for DOS and Windows operating systems).</ahelp>"
+msgid "<ahelp hid=\".\">Appends the alias to the table name in SELECT statements.</ahelp>"
msgstr ""
-#. UDWZ7
+#. wHaBn
#: dabaadvpropdat.xhp
msgctxt ""
"dabaadvpropdat.xhp\n"
-"par_idN1059E\n"
+"par_idN105907\n"
"help.text"
-msgid "Append the table alias name in SELECT statements"
+msgid "Use keyword AS before table alias names"
msgstr ""
-#. v2ZEZ
+#. xEpbm
#: dabaadvpropdat.xhp
msgctxt ""
"dabaadvpropdat.xhp\n"
-"par_idN105A2\n"
+"par_idN105947\n"
"help.text"
-msgid "<ahelp hid=\".\">Appends the alias to the table name in SELECT statements.</ahelp>"
+msgid "<ahelp hid=\".\">Some databases use the keyword \"AS\" between a name and its alias, while other databases use a whitespace. Enable this option to insert AS before the alias.</ahelp>"
msgstr ""
#. 6kz2C
@@ -6324,76 +6306,76 @@ msgctxt ""
msgid "<ahelp hid=\".\">Creates an index with ASC or DESC statements.</ahelp>"
msgstr ""
-#. BzVqp
+#. NbAt4
#: dabaadvpropdat.xhp
msgctxt ""
"dabaadvpropdat.xhp\n"
-"par_idN10621\n"
+"hd_id3534958\n"
"help.text"
-msgid "Comparison of Boolean values"
+msgid "End text lines with CR + LF"
msgstr ""
-#. rgzfK
+#. NKKsC
#: dabaadvpropdat.xhp
msgctxt ""
"dabaadvpropdat.xhp\n"
-"par_idN10625\n"
+"par_id6151921\n"
"help.text"
-msgid "<ahelp hid=\".\">Select the type of Boolean comparison that you want to use.</ahelp>"
+msgid "<ahelp hid=\".\">Select to use the CR + LF code pair to end every text line (preferred for DOS and Windows operating systems).</ahelp>"
msgstr ""
-#. X2cuQ
+#. T9wrt
#: dabaadvpropdat.xhp
msgctxt ""
"dabaadvpropdat.xhp\n"
-"hd_id1101718\n"
+"hd_id0909200811170166\n"
"help.text"
-msgid "Form data input checks for required fields"
+msgid "Ignore currency field information"
msgstr ""
-#. 8FD9D
+#. MWpZD
#: dabaadvpropdat.xhp
msgctxt ""
"dabaadvpropdat.xhp\n"
-"par_id3783989\n"
+"par_id0909200811170221\n"
"help.text"
-msgid "<ahelp hid=\".\">When you enter a new record or update an existing record in a form, and you leave a field empty which is bound to a database column which requires input, then you will see a message complaining about the empty field.</ahelp>"
+msgid "<ahelp hid=\".\">Only for Oracle JDBC connections. When enabled it specifies that no column is treated as a currency field. The field type returned from the database driver is discarded.</ahelp>"
msgstr ""
-#. LPJKD
+#. X2cuQ
#: dabaadvpropdat.xhp
msgctxt ""
"dabaadvpropdat.xhp\n"
-"par_id6684163\n"
+"hd_id1101718\n"
"help.text"
-msgid "If this control box is not enabled, then the forms in the current database will not be checked for required fields."
+msgid "Form data input checks for required fields"
msgstr ""
-#. fZAwm
+#. 8FD9D
#: dabaadvpropdat.xhp
msgctxt ""
"dabaadvpropdat.xhp\n"
-"par_id3837397\n"
+"par_id3783989\n"
"help.text"
-msgid "The control box is available for all data source types which support write access to their data. The control box does not exist for spreadsheets, text, csv, and the various read-only address books."
+msgid "<ahelp hid=\".\">When you enter a new record or update an existing record in a form, and you leave a field empty which is bound to a database column which requires input, then you will see a message complaining about the empty field.</ahelp>"
msgstr ""
-#. T9wrt
+#. LPJKD
#: dabaadvpropdat.xhp
msgctxt ""
"dabaadvpropdat.xhp\n"
-"hd_id0909200811170166\n"
+"par_id6684163\n"
"help.text"
-msgid "Ignore currency field information"
+msgid "If this control box is not enabled, then the forms in the current database will not be checked for required fields."
msgstr ""
-#. MWpZD
+#. fZAwm
#: dabaadvpropdat.xhp
msgctxt ""
"dabaadvpropdat.xhp\n"
-"par_id0909200811170221\n"
+"par_id3837397\n"
"help.text"
-msgid "<ahelp hid=\".\">Only for Oracle JDBC connections. When enabled it specifies that no column is treated as a currency field. The field type returned from the database driver is discarded.</ahelp>"
+msgid "The control box is available for all data source types which support write access to their data. The control box does not exist for spreadsheets, text, csv, and the various read-only address books."
msgstr ""
#. ykjaM
@@ -6459,6 +6441,60 @@ msgctxt ""
msgid "Note that if this option is just for overruling the heuristics. If you enable the check box for a database which actually does not support primary keys, you will see some errors."
msgstr ""
+#. SbhkD
+#: dabaadvpropdat.xhp
+msgctxt ""
+"dabaadvpropdat.xhp\n"
+"hd_id621632736570505\n"
+"help.text"
+msgid "Respect the result set type from the database driver"
+msgstr ""
+
+#. EZkMC
+#: dabaadvpropdat.xhp
+msgctxt ""
+"dabaadvpropdat.xhp\n"
+"par_id641632755407673\n"
+"help.text"
+msgid "Use the database driver different scroll capabilities of a result set. Refer to <link href=\"https://api.libreoffice.org/docs/idl/ref/namespacecom_1_1sun_1_1star_1_1sdbc_1_1ResultSetType.html\" name=\"ResultSetType\">ResultSetType Constant Group</link>"
+msgstr ""
+
+#. BzVqp
+#: dabaadvpropdat.xhp
+msgctxt ""
+"dabaadvpropdat.xhp\n"
+"par_idN10621\n"
+"help.text"
+msgid "Comparison of Boolean values"
+msgstr ""
+
+#. rgzfK
+#: dabaadvpropdat.xhp
+msgctxt ""
+"dabaadvpropdat.xhp\n"
+"par_idN10625\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select the type of Boolean comparison that you want to use.</ahelp>"
+msgstr ""
+
+#. CAkyk
+#: dabaadvpropdat.xhp
+msgctxt ""
+"dabaadvpropdat.xhp\n"
+"hd_id421632739992940\n"
+"help.text"
+msgid "Rows to scan columns types"
+msgstr ""
+
+#. nC3qS
+#: dabaadvpropdat.xhp
+msgctxt ""
+"dabaadvpropdat.xhp\n"
+"par_id541632740596622\n"
+"help.text"
+msgid "Select the number of rows to let the driver detect the data type."
+msgstr ""
+
#. EYaFK
#: dabaadvpropgen.xhp
msgctxt ""
@@ -7467,6 +7503,474 @@ msgctxt ""
msgid "<ahelp hid=\".\">Select a database from the list or click <emph>Create</emph> to create a new database.</ahelp>"
msgstr ""
+#. BhD6X
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"tit\n"
+"help.text"
+msgid "Database Wizard"
+msgstr ""
+
+#. dYT7e
+#: 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>MariaDB databases (Base)</bookmark_value><bookmark_value>dBASE; database settings (Base)</bookmark_value><bookmark_value>jdbc; database settings (Base)</bookmark_value><bookmark_value>odbc; database settings (Base)</bookmark_value><bookmark_value>spreadsheets;as databases (base)</bookmark_value>"
+msgstr ""
+
+#. 5pnX6
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN105B4\n"
+"help.text"
+msgid "<variable id=\"databasewizardh1\"><link href=\"text/sdatabase/dabawiz00.xhp\">Database Wizard</link></variable>"
+msgstr ""
+
+#. 4L7fe
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_id9856563\n"
+"help.text"
+msgid "The Database Wizard creates a <link href=\"text/sdatabase/dabadoc.xhp\">database file</link> that contains information about a database."
+msgstr ""
+
+#. MP58w
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN105D5\n"
+"help.text"
+msgid "Depending on the type of operation and the type of database, the Database Wizard consists of a varying number of steps."
+msgstr ""
+
+#. BvAbd
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN105DB\n"
+"help.text"
+msgid "If you create a new database file, the wizard contains two steps."
+msgstr ""
+
+#. 75qWp
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN105DF\n"
+"help.text"
+msgid "If you open the Database Wizard to create a database file for an existing database connection, there may be more steps to specify paths, authentication information, and more."
+msgstr ""
+
+#. wFFQE
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN105F2\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">Set up text file connection</link>"
+msgstr ""
+
+#. 73X5w
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN10601\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">Set up Microsoft Access connection</link>"
+msgstr ""
+
+#. ckemB
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN1062E\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">Set up ADO connection</link>"
+msgstr ""
+
+#. bbTEe
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN1070F\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02dbase.xhp\">Set up dBASE connection</link>"
+msgstr ""
+
+#. mM3XM
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN1063D\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">Set up JDBC connection</link>"
+msgstr ""
+
+#. EB2yp
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN1064C\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">Set up Oracle database connection</link>"
+msgstr ""
+
+#. sSrMX
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN1066A\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC settings</link>"
+msgstr ""
+
+#. Jht8w
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN10679\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02spreadsheet.xhp\">Set up Spreadsheet connection</link>"
+msgstr ""
+
+#. menWz
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"tit\n"
+"help.text"
+msgid "Database Selection"
+msgstr ""
+
+#. cE94h
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"bm_id2082583\n"
+"help.text"
+msgid "<bookmark_value>databases; connecting (Base)</bookmark_value>"
+msgstr ""
+
+#. 6LQ8F
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1054D\n"
+"help.text"
+msgid "<variable id=\"databaseselectionh1\"><link href=\"text/sdatabase/dabawiz01.xhp\">Select Database</link></variable>"
+msgstr ""
+
+#. MNcgG
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1055D\n"
+"help.text"
+msgid "<ahelp hid=\".\">Creates a new database, opens a database file, or connects to an existing database.</ahelp>"
+msgstr ""
+
+#. 3gKji
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10585\n"
+"help.text"
+msgid "Create a new database"
+msgstr ""
+
+#. QsxqK
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10589\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select to create a new database. </ahelp>This option uses the HSQL database engine with default settings. The final page of the wizard appears next."
+msgstr ""
+
+#. FMbMQ
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_id8584246\n"
+"help.text"
+msgid "<link href=\"http://hsqldb.org/\">External web page about HSQL</link>."
+msgstr ""
+
+#. RzgCQ
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN105F9\n"
+"help.text"
+msgid "Open an existing database file"
+msgstr ""
+
+#. SrmuV
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN105FD\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select to open a database file from a list of recently used files or from a file selection dialog.</ahelp>"
+msgstr ""
+
+#. HNAd8
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10614\n"
+"help.text"
+msgid "Recently used"
+msgstr ""
+
+#. ZGuNR
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10618\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select a database file to open from the list of recently used files. Click Finish to open the file immediately and to exit the wizard.</ahelp>"
+msgstr ""
+
+#. ACzer
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1062F\n"
+"help.text"
+msgid "Open"
+msgstr ""
+
+#. 9WBfN
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10633\n"
+"help.text"
+msgid "<ahelp hid=\".\">Opens a file selection dialog where you can select a database file. Click Open or OK in the file selection dialog to open the file immediately and to exit the wizard.</ahelp>"
+msgstr ""
+
+#. rLwWT
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1058C\n"
+"help.text"
+msgid "Connect to an existing database"
+msgstr ""
+
+#. tF4HK
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10590\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select to create a database document for an existing database connection.</ahelp>"
+msgstr ""
+
+#. M4MGu
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10593\n"
+"help.text"
+msgid "Database type"
+msgstr ""
+
+#. jypBq
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10597\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select the database type for the existing database connection.</ahelp>"
+msgstr ""
+
+#. xNvnU
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1059A\n"
+"help.text"
+msgid "The Outlook, Evolution, KDE Address Book, and Seamonkey database types do not need additional information. For other database types, the wizard contains additional pages to specify the required information."
+msgstr ""
+
+#. 4RN7W
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10611\n"
+"help.text"
+msgid "The next wizard page is one of the following pages:"
+msgstr ""
+
+#. vaBGS
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1061C\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">Set up text file connection</link>"
+msgstr ""
+
+#. NEWQn
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1062B\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">Set up Microsoft Access or Microsoft Access 2007 connection</link>"
+msgstr ""
+
+#. NCWx8
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1063A\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02ldap.xhp\">Set up LDAP connection</link>"
+msgstr ""
+
+#. 29mSc
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10658\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">Set up ADO connection</link>"
+msgstr ""
+
+#. sUX3D
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10667\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">Set up JDBC connection</link>"
+msgstr ""
+
+#. BRUYG
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10676\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">Set up Oracle database connection</link>"
+msgstr ""
+
+#. JtGv6
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10694\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC settings</link>"
+msgstr ""
+
+#. A69nZ
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN106A3\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02spreadsheet.xhp\">Set up Spreadsheet connection</link>"
+msgstr ""
+
+#. YSNPt
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"tit\n"
+"help.text"
+msgid "Set up user authentication"
+msgstr ""
+
+#. EhtLD
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN1053A\n"
+"help.text"
+msgid "Set up user authentication"
+msgstr ""
+
+#. TGHfv
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN1053E\n"
+"help.text"
+msgid "Some databases require a user name and password."
+msgstr ""
+
+#. 6YqKR
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN10541\n"
+"help.text"
+msgid "User name"
+msgstr ""
+
+#. q5JV4
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN10545\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter the user name to access the database.</ahelp>"
+msgstr ""
+
+#. cAFEU
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN10548\n"
+"help.text"
+msgid "Password required"
+msgstr ""
+
+#. wctGK
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN1054C\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select to prompt a user for a password to access the database.</ahelp>"
+msgstr ""
+
+#. xnkR8
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN10549\n"
+"help.text"
+msgid "Test Connection"
+msgstr ""
+
+#. jkqUK
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN10546\n"
+"help.text"
+msgid "<ahelp hid=\".\">Check if the configured connection can be used to access the database.</ahelp>"
+msgstr ""
+
+#. 9d4Bh
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN1054F\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02.xhp\">Save and proceed</link>"
+msgstr ""
+
#. cLmBi
#: main.xhp
msgctxt ""
@@ -7557,14 +8061,14 @@ msgctxt ""
msgid "To create a new database file, choose <emph>File - New - Database</emph>."
msgstr "要新建数据库文件,选择<emph>文件 - 新建 - 数据库</emph>。"
-#. h4EpR
+#. QGxGW
#: main.xhp
msgctxt ""
"main.xhp\n"
"par_idN1083B\n"
"help.text"
-msgid "The <link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link> helps you to create a database file and to register a new database within %PRODUCTNAME."
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>会帮助您新建数据库文件,并在 %PRODUCTNAME 中注册新数据库。"
+msgid "The <link href=\"text/sdatabase/dabawiz01.xhp\">Database Wizard</link> helps you to create a database file and to register a new database within %PRODUCTNAME."
+msgstr ""
#. 2jPWg
#: main.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/sdraw.po b/source/zh-CN/helpcontent2/source/text/sdraw.po
index d0432aad940..3288e126f1c 100644
--- a/source/zh-CN/helpcontent2/source/text/sdraw.po
+++ b/source/zh-CN/helpcontent2/source/text/sdraw.po
@@ -4,16 +4,16 @@ 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: 2021-09-20 13:03+0200\n"
-"PO-Revision-Date: 2019-07-04 11:34+0000\n"
-"Last-Translator: Dian LI <xslidian@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: zh_CN\n"
+"PO-Revision-Date: 2021-10-04 18:05+0000\n"
+"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
+"Language-Team: Chinese (Simplified) <https://translations.documentfoundation.org/projects/libo_help-master/textsdraw/zh_Hans/>\n"
+"Language: zh-CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Accelerator-Marker: ~\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Weblate 4.8.1\n"
"X-POOTLE-MTIME: 1562240050.000000\n"
#. dHbww
@@ -113,7 +113,7 @@ msgctxt ""
"tit\n"
"help.text"
msgid "View (menu in Draw)"
-msgstr ""
+msgstr "查看(Draw中的菜单)"
#. hWYJ3
#: main0103.xhp
@@ -158,7 +158,7 @@ msgctxt ""
"par_idN105B2\n"
"help.text"
msgid "Master"
-msgstr ""
+msgstr "母板"
#. eSnQZ
#: main0103.xhp
@@ -167,7 +167,7 @@ msgctxt ""
"par_idN105B6\n"
"help.text"
msgid "Switch to the master view."
-msgstr ""
+msgstr "切换到母板视图。"
#. nstgU
#: main0103.xhp
@@ -176,7 +176,7 @@ msgctxt ""
"hd_id221605492986383\n"
"help.text"
msgid "<link href=\"text/shared/01/notebook_bar.xhp\" name=\"userinterface\">User Interface</link>"
-msgstr ""
+msgstr "<link href=\"text/shared/01/notebook_bar.xhp\" name=\"userinterface\">用户界面</link>"
#. tYxbF
#: main0103.xhp
@@ -185,7 +185,7 @@ msgctxt ""
"par_id761605493042236\n"
"help.text"
msgid "Opens dialog box for selecting layout of user interface."
-msgstr ""
+msgstr "打开对话框,以选择用户界面的布局方式。"
#. JChXS
#: main0103.xhp
@@ -194,7 +194,7 @@ msgctxt ""
"hd_id102720151746522815\n"
"help.text"
msgid "Comments"
-msgstr ""
+msgstr "批注"
#. XjZkS
#: main0103.xhp
@@ -203,7 +203,7 @@ msgctxt ""
"par_id102720150112252143\n"
"help.text"
msgid "Show or hide annotations on the page."
-msgstr ""
+msgstr "显示或隐藏页面上的批注。"
#. Y3uKu
#: main0103.xhp
@@ -212,7 +212,7 @@ msgctxt ""
"hd_id961605560845125\n"
"help.text"
msgid "Shift"
-msgstr ""
+msgstr "移动"
#. 3Eaeo
#: main0103.xhp
@@ -221,7 +221,7 @@ msgctxt ""
"par_id301605560855098\n"
"help.text"
msgid "Use to shift the position of the page in the window. When enabled, the appearance of the mouse pointer changes. Click the page and drag to desired position."
-msgstr ""
+msgstr "用于移动页面在窗口上的位置。若启用,鼠标的外观会发生变化,之后在页面上单击并拖放即可将页面移动到需要的位置。"
#. 7AgpR
#: main0103.xhp
@@ -455,7 +455,7 @@ msgctxt ""
"par_idN106C8\n"
"help.text"
msgid "<link href=\"text/simpress/02/10030200.xhp\" name=\"Gluepoints\">Gluepoints</link>"
-msgstr ""
+msgstr "<link href=\"text/simpress/02/10030200.xhp\" name=\"Gluepoints\">粘结点</link>"
#. kz8Fw
#: main0210.xhp
@@ -464,7 +464,7 @@ msgctxt ""
"par_idN106D7\n"
"help.text"
msgid "Enables you to edit gluepoints on your drawing."
-msgstr ""
+msgstr "若启用,您可以在绘图中编辑“粘接点”。"
#. 3Cwi3
#: main0210.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/sdraw/00.po b/source/zh-CN/helpcontent2/source/text/sdraw/00.po
index 925d56ebc38..e0d9c3da050 100644
--- a/source/zh-CN/helpcontent2/source/text/sdraw/00.po
+++ b/source/zh-CN/helpcontent2/source/text/sdraw/00.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
"POT-Creation-Date: 2020-11-03 12:42+0100\n"
-"PO-Revision-Date: 2021-08-16 16:51+0000\n"
-"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
+"PO-Revision-Date: 2021-10-04 18:05+0000\n"
+"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
"Language-Team: Chinese (Simplified) <https://translations.documentfoundation.org/projects/libo_help-master/textsdraw00/zh_Hans/>\n"
"Language: zh-CN\n"
"MIME-Version: 1.0\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Accelerator-Marker: ~\n"
-"X-Generator: Weblate 4.6.2\n"
+"X-Generator: Weblate 4.8.1\n"
"X-POOTLE-MTIME: 1558413923.000000\n"
#. EDSDr
@@ -122,7 +122,7 @@ msgctxt ""
"par_id231566134395223\n"
"help.text"
msgid "<variable id=\"menupagerename\">Choose <menuitem>Page - Rename Page</menuitem></variable>"
-msgstr ""
+msgstr "<variable id=\"menupagerename\">选择 <menuitem>页面 - 重命名页面</menuitem></variable>"
#. D8EKG
#: page_menu.xhp
@@ -131,7 +131,7 @@ msgctxt ""
"par_id311566135070776\n"
"help.text"
msgid "<variable id=\"contextmenurename\">Right-click on the page thumbnail and choose <menuitem>Rename Page</menuitem></variable>"
-msgstr ""
+msgstr "<variable id=\"contextmenurename\">右键单击页面缩略图,然后选择<menuitem>重命名页面</menuitem></variable>"
#. fbrxo
#: page_menu.xhp
@@ -140,7 +140,7 @@ msgctxt ""
"par_id141566138212217\n"
"help.text"
msgid "<variable id=\"menupagedelete\">Choose <menuitem>Page - Delete Page</menuitem></variable>"
-msgstr ""
+msgstr "<variable id=\"menupagedelete\">选择<menuitem>页面 - 删除页面</menuitem></variable>"
#. puE7E
#: page_menu.xhp
@@ -149,7 +149,7 @@ msgctxt ""
"par_id261566138218294\n"
"help.text"
msgid "<variable id=\"contextmenudelete\">Right-click on the page thumbnail and choose <menuitem>Delete Page</menuitem></variable>"
-msgstr ""
+msgstr "<variable id=\"contextmenudelete\">右键单击页面缩略图,然后选择 <menuitem>删除页面</menuitem></variable>"
#. ohiUM
#: page_menu.xhp
@@ -158,7 +158,7 @@ msgctxt ""
"par_id491566139741356\n"
"help.text"
msgid "<variable id=\"menupageduplicate\">Choose <menuitem>Page - Duplicate Page</menuitem></variable>"
-msgstr ""
+msgstr "<variable id=\"menupageduplicate\">选择<menuitem>页面 - 创建页面副本</menuitem></variable>"
#. 4B9YP
#: page_menu.xhp
@@ -167,4 +167,4 @@ msgctxt ""
"par_id301566157911675\n"
"help.text"
msgid "<variable id=\"pagenavigation\">Choose <menuitem>Page - Navigate</menuitem>.</variable>"
-msgstr ""
+msgstr "<variable id=\"pagenavigation\">选择<menuitem>页面 - 导航</menuitem>。</variable>"
diff --git a/source/zh-CN/helpcontent2/source/text/sdraw/01.po b/source/zh-CN/helpcontent2/source/text/sdraw/01.po
index 8ba82b95801..014ca4072af 100644
--- a/source/zh-CN/helpcontent2/source/text/sdraw/01.po
+++ b/source/zh-CN/helpcontent2/source/text/sdraw/01.po
@@ -4,7 +4,7 @@ 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: 2021-06-24 12:51+0200\n"
-"PO-Revision-Date: 2021-09-22 18:36+0000\n"
+"PO-Revision-Date: 2021-09-30 02:36+0000\n"
"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
"Language-Team: Chinese (Simplified) <https://translations.documentfoundation.org/projects/libo_help-master/textsdraw01/zh_Hans/>\n"
"Language: zh-CN\n"
@@ -50,7 +50,7 @@ msgctxt ""
"par_idN10575\n"
"help.text"
msgid "Extrusion On/Off"
-msgstr ""
+msgstr "切换拉伸"
#. FovPY
#: 3dsettings_toolbar.xhp
@@ -77,7 +77,7 @@ msgctxt ""
"par_id241592603243554\n"
"help.text"
msgid "Extrusion On/Off"
-msgstr ""
+msgstr "切换拉伸"
#. DCtCL
#: 3dsettings_toolbar.xhp
@@ -86,7 +86,7 @@ msgctxt ""
"par_idN10590\n"
"help.text"
msgid "Tilt Down"
-msgstr ""
+msgstr "下俯"
#. DPBMs
#: 3dsettings_toolbar.xhp
@@ -95,7 +95,7 @@ msgctxt ""
"par_idN10594\n"
"help.text"
msgid "<ahelp hid=\".\">Tilts the selected object downwards by five degrees.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\".\">使选中的对象下俯五度。</ahelp>"
#. d4yN5
#: 3dsettings_toolbar.xhp
@@ -113,7 +113,7 @@ msgctxt ""
"par_id771592603809183\n"
"help.text"
msgid "Tilt Down"
-msgstr ""
+msgstr "下俯"
#. EBVNf
#: 3dsettings_toolbar.xhp
@@ -122,7 +122,7 @@ msgctxt ""
"par_idN105AB\n"
"help.text"
msgid "Tilt Up"
-msgstr ""
+msgstr "上翘"
#. 7wLkh
#: 3dsettings_toolbar.xhp
@@ -131,7 +131,7 @@ msgctxt ""
"par_idN105AF\n"
"help.text"
msgid "<ahelp hid=\".\">Tilts the selected object upwards by five degrees.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\".\">使选中的对象上翘五度。</ahelp>"
#. Qk9TG
#: 3dsettings_toolbar.xhp
@@ -149,7 +149,7 @@ msgctxt ""
"par_id641592603969035\n"
"help.text"
msgid "Tilt Up"
-msgstr ""
+msgstr "上翘"
#. eY4A6
#: 3dsettings_toolbar.xhp
@@ -158,7 +158,7 @@ msgctxt ""
"par_idN105C6\n"
"help.text"
msgid "Tilt Left"
-msgstr ""
+msgstr "左偏"
#. 7jGNr
#: 3dsettings_toolbar.xhp
@@ -167,7 +167,7 @@ msgctxt ""
"par_idN105CA\n"
"help.text"
msgid "<ahelp hid=\".\">Tilts the selected object left by five degrees.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\".\">使选中的对象左偏五度。</ahelp>"
#. 58eJK
#: 3dsettings_toolbar.xhp
@@ -185,7 +185,7 @@ msgctxt ""
"par_id301592604038426\n"
"help.text"
msgid "Tilt Left"
-msgstr ""
+msgstr "左偏"
#. EWcBG
#: 3dsettings_toolbar.xhp
@@ -194,7 +194,7 @@ msgctxt ""
"par_idN105E1\n"
"help.text"
msgid "Tilt Right"
-msgstr ""
+msgstr "右偏"
#. ZixBw
#: 3dsettings_toolbar.xhp
@@ -203,7 +203,7 @@ msgctxt ""
"par_idN105E5\n"
"help.text"
msgid "<ahelp hid=\".\">Tilts the selected object right by five degrees.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\".\">使选中的对象右偏五度。</ahelp>"
#. CfWCi
#: 3dsettings_toolbar.xhp
@@ -221,7 +221,7 @@ msgctxt ""
"par_id601592604069773\n"
"help.text"
msgid "Tilt Right"
-msgstr ""
+msgstr "右偏"
#. DCn4A
#: 3dsettings_toolbar.xhp
@@ -626,7 +626,7 @@ msgctxt ""
"tit\n"
"help.text"
msgid "Delete Page"
-msgstr ""
+msgstr "删除页面"
#. P4xnm
#: delete_page.xhp
@@ -635,7 +635,7 @@ msgctxt ""
"hd_id3150202\n"
"help.text"
msgid "<link href=\"text/sdraw/01/delete_page.xhp\" name=\"Delete Page\">Delete Page</link>"
-msgstr ""
+msgstr "<link href=\"text/sdraw/01/delete_page.xhp\" name=\"删除页面\">删除页面</link>"
#. bZsV9
#: delete_page.xhp
@@ -644,7 +644,7 @@ msgctxt ""
"par_id3152988\n"
"help.text"
msgid "Delete the current page."
-msgstr ""
+msgstr "删除当前页。"
#. G6pqH
#: duplicate_page.xhp
@@ -653,7 +653,7 @@ msgctxt ""
"tit\n"
"help.text"
msgid "Duplicate Page"
-msgstr ""
+msgstr "创建页面副本"
#. roEJR
#: duplicate_page.xhp
@@ -662,7 +662,7 @@ msgctxt ""
"hd_id3148576\n"
"help.text"
msgid "<link href=\"text/sdraw/01/duplicate_page.xhp\" name=\"Duplicate Page\">Duplicate Page</link>"
-msgstr ""
+msgstr "<link href=\"text/sdraw/01/duplicate_page.xhp\" name=\"创建页面副本\">创建页面副本</link>"
#. iyueQ
#: duplicate_page.xhp
@@ -671,7 +671,7 @@ msgctxt ""
"par_id3153190\n"
"help.text"
msgid "<ahelp hid=\".uno:DuplicatePage\" visibility=\"visible\">Inserts a copy of the current page after the current page.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\".uno:DuplicatePage\" visibility=\"visible\">创建当前页的副本并将其插入到当前页之后。</ahelp>"
#. 2LJK2
#: insert_layer.xhp
@@ -1040,7 +1040,7 @@ msgctxt ""
"par_id3152988\n"
"help.text"
msgid "Inserts a blank page after the selected page."
-msgstr ""
+msgstr "在选中页之后插入一个空白页面。"
#. PvXKR
#: page_properties.xhp
@@ -1085,7 +1085,7 @@ msgctxt ""
"tit\n"
"help.text"
msgid "Rename Page"
-msgstr ""
+msgstr "重命名页面"
#. pEyqm
#: rename_page.xhp
@@ -1094,7 +1094,7 @@ msgctxt ""
"hd_id301566092814709\n"
"help.text"
msgid "<link href=\"text/sdraw/01/rename_page.xhp\" name=\"rename page\">Rename Page</link>"
-msgstr ""
+msgstr "<link href=\"text/sdraw/01/rename_page.xhp\" name=\"重命名页面\">重命名页面</link>"
#. FHcgw
#: rename_page.xhp
@@ -1103,7 +1103,7 @@ msgctxt ""
"par_id511566092814710\n"
"help.text"
msgid "<variable id=\"rename_page\"><ahelp hid=\".\">Set a new name for the page.</ahelp></variable>"
-msgstr ""
+msgstr "<variable id=\"rename_page\"><ahelp hid=\".\">为页面设置新的名称。</ahelp></variable>"
#. GDjU6
#: rename_page.xhp
@@ -1112,7 +1112,7 @@ msgctxt ""
"hd_id901566134453327\n"
"help.text"
msgid "Name"
-msgstr ""
+msgstr "名称"
#. vJ65G
#: rename_page.xhp
@@ -1121,4 +1121,4 @@ msgctxt ""
"par_id371566134462398\n"
"help.text"
msgid "Enter the new name of the page."
-msgstr ""
+msgstr "输入页面的新名称。"
diff --git a/source/zh-CN/helpcontent2/source/text/shared/01.po b/source/zh-CN/helpcontent2/source/text/shared/01.po
index 55cd1c36366..c0ef092bf82 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/01.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/01.po
@@ -3,8 +3,8 @@ 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: 2021-09-27 19:09+0200\n"
-"PO-Revision-Date: 2021-07-01 16:20+0000\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
+"PO-Revision-Date: 2021-10-03 18:36+0000\n"
"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
"Language-Team: Chinese (Simplified) <https://translations.documentfoundation.org/projects/libo_help-master/textshared01/zh_Hans/>\n"
"Language: zh-CN\n"
@@ -223,13 +223,13 @@ msgctxt ""
msgid "Database"
msgstr "数据库"
-#. 9cSKy
+#. H6M7M
#: 01010000.xhp
msgctxt ""
"01010000.xhp\n"
"par_idN108D0\n"
"help.text"
-msgid "Opens the <link href=\"text/shared/explorer/database/dabawiz00.xhp\"><emph>Database Wizard</emph></link> to create a <link href=\"text/sdatabase/dabadoc.xhp\"><emph>database file</emph></link>."
+msgid "Opens the <link href=\"text/sdatabase/dabawiz01.xhp\"><emph>Database Wizard</emph></link> to create a <link href=\"text/sdatabase/dabadoc.xhp\"><emph>database file</emph></link>."
msgstr ""
#. 9nYdo
@@ -7115,7 +7115,7 @@ msgctxt ""
"hd_id3147477\n"
"help.text"
msgid "<variable id=\"paste_specialh1\"><link href=\"text/shared/01/02070000.xhp\" name=\"Paste Special\">Paste Special</link></variable>"
-msgstr ""
+msgstr "<variable id=\"paste_specialh1\"><link href=\"text/shared/01/02070000.xhp\" name=\"选择性粘贴\">选择性粘贴</link></variable>"
#. 2xiJU
#: 02070000.xhp
@@ -7124,7 +7124,7 @@ msgctxt ""
"par_id3147143\n"
"help.text"
msgid "<variable id=\"inhalteeinfuegentext\"><ahelp hid=\".uno:PasteSpecial\">Inserts the contents of the clipboard into the current file in a format that you can specify.</ahelp></variable>"
-msgstr "<variable id=\"inhalteeinfuegentext\"><ahelp hid=\".uno:PasteSpecial\">将剪贴板上的内容插入到当前文件中,格式可以由您指定。</ahelp></variable>"
+msgstr "<variable id=\"inhalteeinfuegentext\"><ahelp hid=\".uno:PasteSpecial\">将剪贴板上的内容以您指定的格式插入到当前文件中。</ahelp></variable>"
#. uZccp
#: 02070000.xhp
@@ -7160,7 +7160,7 @@ msgctxt ""
"par_id3149812\n"
"help.text"
msgid "<ahelp hid=\"cui/ui/pastespecial/list\">Select a format for the clipboard contents that you want to paste. The available format depends on the copied or cut source format.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"cui/ui/pastespecial/list\">选择您要以何种格式粘贴剪贴板上的内容。具体可选的格式和被剪切或复制的来源格式有关。</ahelp>"
#. HzshB
#: 02070000.xhp
@@ -7169,7 +7169,7 @@ msgctxt ""
"par_id3147653\n"
"help.text"
msgid "When you paste HTML data into a text document, you can choose \"<emph>HTML format</emph>\" or \"<emph>HTML format without comments</emph>\". The second choice is the default; it pastes all HTML data, but no comments."
-msgstr ""
+msgstr "在把 HTML 数据粘贴到文本文档中时,您可以选择「<emph>HTML 格式</emph>」或「<emph>不带注释的 HTML 格式</emph>」。后者是默认选项,会粘贴除注释之外的全部 HTML 数据。"
#. AiR33
#: 02070000.xhp
@@ -7178,7 +7178,7 @@ msgctxt ""
"hd_id3155420\n"
"help.text"
msgid "Paste Special"
-msgstr ""
+msgstr "选择性粘贴"
#. yj2Fr
#: 02070000.xhp
@@ -7187,7 +7187,7 @@ msgctxt ""
"par_id3150976\n"
"help.text"
msgid "This dialog appears in Calc if the clipboard contains spreadsheet cells."
-msgstr ""
+msgstr "如果剪贴板上有电子表格单元格数据,在 Calc 中会出现此对话框。"
#. HA2yt
#: 02070000.xhp
@@ -7196,7 +7196,7 @@ msgctxt ""
"hd_id191630440520574\n"
"help.text"
msgid "Presets"
-msgstr ""
+msgstr "预设方式"
#. H4Mqr
#: 02070000.xhp
@@ -7205,7 +7205,7 @@ msgctxt ""
"par_id951630440692605\n"
"help.text"
msgid "Choose one of the presets to quickly load commonly used settings for Paste Special."
-msgstr ""
+msgstr "从几种预设方式中选择并快速加载一种常用的「选择性粘贴」设置。"
#. DBS7B
#: 02070000.xhp
@@ -7214,7 +7214,7 @@ msgctxt ""
"hd_id41630440570501\n"
"help.text"
msgid "Values Only"
-msgstr ""
+msgstr "仅粘贴值"
#. pk4yA
#: 02070000.xhp
@@ -7223,7 +7223,7 @@ msgctxt ""
"par_id111630440722545\n"
"help.text"
msgid "Pastes only cell contents including text, numbers and dates."
-msgstr ""
+msgstr "仅粘贴包括文本、数值和日期的单元格内容。"
#. khvcS
#: 02070000.xhp
@@ -7232,7 +7232,7 @@ msgctxt ""
"hd_id891630440587478\n"
"help.text"
msgid "Values & Formats"
-msgstr ""
+msgstr "粘贴值和格式"
#. h6phw
#: 02070000.xhp
@@ -7241,7 +7241,7 @@ msgctxt ""
"par_id511630441051343\n"
"help.text"
msgid "Pastes cell contents and formats applied to cells."
-msgstr ""
+msgstr "粘贴单元格内容,并将格式应用于单元格。"
#. VUzzv
#: 02070000.xhp
@@ -7250,7 +7250,7 @@ msgctxt ""
"hd_id301630440615367\n"
"help.text"
msgid "Formats Only"
-msgstr ""
+msgstr "仅粘贴格式"
#. uStsB
#: 02070000.xhp
@@ -7259,7 +7259,7 @@ msgctxt ""
"par_id851630441123702\n"
"help.text"
msgid "Pastes only formats applied to cells."
-msgstr ""
+msgstr "仅将格式粘贴并应用于单元格。"
#. 2kAAp
#: 02070000.xhp
@@ -7268,7 +7268,7 @@ msgctxt ""
"hd_id81630440632865\n"
"help.text"
msgid "Transpose All"
-msgstr ""
+msgstr "整体转置"
#. dszzk
#: 02070000.xhp
@@ -7277,7 +7277,7 @@ msgctxt ""
"par_id41630441349354\n"
"help.text"
msgid "Pastes all cell contents with their positions transposed."
-msgstr ""
+msgstr "将所有单元格内容粘贴到转置后的位置。"
#. uNrP7
#: 02070000.xhp
@@ -7286,7 +7286,7 @@ msgctxt ""
"hd_id991630441460829\n"
"help.text"
msgid "Run immediately"
-msgstr ""
+msgstr "立即运行"
#. FP5bX
#: 02070000.xhp
@@ -7295,7 +7295,7 @@ msgctxt ""
"par_id331630441454811\n"
"help.text"
msgid "Check this option to load the preset and immediately apply it. When unchecked, choosing a preset will only load the corresponding options in the dialog without pasting anything."
-msgstr ""
+msgstr "勾选此选项时,会加载预设方式并立即应用于粘贴操作。不勾选时,选择一种预设方式只会加载与其对应的本对话框中具体选项设置,而不会粘贴任何内容。"
#. 3etKJ
#: 02070000.xhp
@@ -7304,7 +7304,7 @@ msgctxt ""
"par_id811630441564039\n"
"help.text"
msgid "Uncheck <emph>Run immediately</emph> to load the options from the preset and change its settings in the Paste Special dialog before applying them by clicking <emph>OK</emph>."
-msgstr ""
+msgstr "不勾选「<emph>立即运行</emph>」即可在加载预设方式后,再改动「选择性粘贴」对话框中的具体设置,最后按「<emph>确定</emph>」按钮使用这些设置进行粘贴。"
#. LTyRC
#: 02070000.xhp
@@ -7313,7 +7313,7 @@ msgctxt ""
"hd_id3155341\n"
"help.text"
msgid "Selection"
-msgstr ""
+msgstr "选择"
#. ENGDQ
#: 02070000.xhp
@@ -7322,7 +7322,7 @@ msgctxt ""
"par_id3152909\n"
"help.text"
msgid "Select a format for the clipboard contents that you want to paste."
-msgstr ""
+msgstr "选择要以什么方式粘贴剪贴板上的内容。"
#. rPXGJ
#: 02070000.xhp
@@ -7331,7 +7331,7 @@ msgctxt ""
"hd_id3145120\n"
"help.text"
msgid "Paste all"
-msgstr ""
+msgstr "全部"
#. aBXw3
#: 02070000.xhp
@@ -7340,7 +7340,7 @@ msgctxt ""
"par_id3146848\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/paste_all\">Pastes all cell contents, comments, formats, and objects into the current document.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/paste_all\">将单元格的所有内容、批注、格式和内含对象都粘贴到当前文档中。</ahelp>"
#. 2zvDG
#: 02070000.xhp
@@ -7349,7 +7349,7 @@ msgctxt ""
"hd_id3155449\n"
"help.text"
msgid "Text"
-msgstr ""
+msgstr "文本"
#. REHuj
#: 02070000.xhp
@@ -7358,7 +7358,7 @@ msgctxt ""
"par_id3149244\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/text\">Inserts cells containing text.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/text\">插入包含文本的单元格。</ahelp>"
#. EBWrT
#: 02070000.xhp
@@ -7367,7 +7367,7 @@ msgctxt ""
"hd_id3148947\n"
"help.text"
msgid "Numbers"
-msgstr ""
+msgstr "数值"
#. GDE2X
#: 02070000.xhp
@@ -7376,7 +7376,7 @@ msgctxt ""
"par_id3152360\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/numbers\">Inserts cells containing numbers.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/numbers\">插入包含数值的单元格。</ahelp>"
#. EuRG9
#: 02070000.xhp
@@ -7385,7 +7385,7 @@ msgctxt ""
"hd_id3151054\n"
"help.text"
msgid "Date & Time"
-msgstr ""
+msgstr "日期与时间"
#. kMiEY
#: 02070000.xhp
@@ -7394,7 +7394,7 @@ msgctxt ""
"par_id3154226\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/datetime\">Inserts cells containing date and time values.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/datetime\">插入包含日期与时间的单元格。</ahelp>"
#. jBXgB
#: 02070000.xhp
@@ -7403,7 +7403,7 @@ msgctxt ""
"hd_id3150791\n"
"help.text"
msgid "Formulas"
-msgstr ""
+msgstr "公式"
#. siXaL
#: 02070000.xhp
@@ -7412,7 +7412,7 @@ msgctxt ""
"par_id3145744\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/formulas\">Inserts cells containing formulae.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/formulas\">插入包含公式的单元格。</ahelp>"
#. 8hAk2
#: 02070000.xhp
@@ -7421,7 +7421,7 @@ msgctxt ""
"hd_id3153968\n"
"help.text"
msgid "Comments"
-msgstr ""
+msgstr "批注"
#. PSGBG
#: 02070000.xhp
@@ -7430,7 +7430,7 @@ msgctxt ""
"par_id3156422\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/comments\">Inserts comments that are attached to cells. If you want to add the comments to the existing cell content, select the \"Add\" operation.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/comments\">插入附在单元格上的批注。如果您需要在已包含内容的单元格上增添批注,请在运算选项中选择「加」。</ahelp>"
#. BVEu4
#: 02070000.xhp
@@ -7439,7 +7439,7 @@ msgctxt ""
"hd_id3152935\n"
"help.text"
msgid "Formats"
-msgstr ""
+msgstr "格式"
#. sSEUh
#: 02070000.xhp
@@ -7448,7 +7448,7 @@ msgctxt ""
"par_id3125863\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/formats\">Inserts cell format attributes.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/formats\">插入单元格的格式属性。</ahelp>"
#. vt4Hc
#: 02070000.xhp
@@ -7457,7 +7457,7 @@ msgctxt ""
"hd_id3156282\n"
"help.text"
msgid "Objects"
-msgstr ""
+msgstr "对象"
#. L7ZAm
#: 02070000.xhp
@@ -7466,7 +7466,7 @@ msgctxt ""
"par_id3149810\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/objects\">Inserts objects contained within the selected cell range. These can be OLE objects, chart objects, or drawing objects.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/objects\">插入在选中单元格区域中包含的对象。这包括 OLE 对象、图表对象和绘图对象。</ahelp>"
#. PEQod
#: 02070000.xhp
@@ -7475,7 +7475,7 @@ msgctxt ""
"hd_id3150440\n"
"help.text"
msgid "Operations"
-msgstr ""
+msgstr "运算"
#. MjkRH
#: 02070000.xhp
@@ -7484,7 +7484,7 @@ msgctxt ""
"par_id3151351\n"
"help.text"
msgid "Select the operation to apply when you paste cells into your sheet."
-msgstr ""
+msgstr "选择在把单元格粘贴到工作表中时进行的运算操作。"
#. Ea8L3
#: 02070000.xhp
@@ -7493,7 +7493,7 @@ msgctxt ""
"hd_id3153952\n"
"help.text"
msgid "None"
-msgstr ""
+msgstr "无"
#. Ff6dF
#: 02070000.xhp
@@ -7502,7 +7502,7 @@ msgctxt ""
"par_id3147348\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/none\">Does not apply an operation when you insert the cell range from the clipboard. The contents of the clipboard will replace existing cell contents.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/none\">从剪贴板插入单元格区域时不进行任何运算。剪贴板上的内容将取代单元格已有的内容。</ahelp>"
#. nub6H
#: 02070000.xhp
@@ -7511,7 +7511,7 @@ msgctxt ""
"hd_id3154988\n"
"help.text"
msgid "Add"
-msgstr ""
+msgstr "加"
#. htC6o
#: 02070000.xhp
@@ -7520,7 +7520,7 @@ msgctxt ""
"par_id3159196\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/add\">Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains comments, adds the comments to the target cells.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/add\">将剪贴板上单元格中的值和目标单元格中的值相加。另外,如果剪贴板上只有批注,则把批注附加到目标单元格上。</ahelp>"
#. xCBTk
#: 02070000.xhp
@@ -7529,7 +7529,7 @@ msgctxt ""
"hd_id3145263\n"
"help.text"
msgid "Subtract"
-msgstr ""
+msgstr "减"
#. LmxHG
#: 02070000.xhp
@@ -7538,7 +7538,7 @@ msgctxt ""
"par_id3154149\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/subtract\">Subtracts the values in the clipboard cells from the values in the target cells.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/subtract\">从目标单元格中的值里减去剪贴板上单元格中的值。</ahelp>"
#. CkGuW
#: 02070000.xhp
@@ -7547,7 +7547,7 @@ msgctxt ""
"hd_id3155312\n"
"help.text"
msgid "Multiply"
-msgstr ""
+msgstr "乘"
#. JQTu7
#: 02070000.xhp
@@ -7556,7 +7556,7 @@ msgctxt ""
"par_id3155307\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/multiply\">Multiplies the values in the clipboard cells with the values in the target cells.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/multiply\">将剪贴板上单元格中的值和目标单元格中的值相乘。</ahelp>"
#. wwJFy
#: 02070000.xhp
@@ -7565,7 +7565,7 @@ msgctxt ""
"hd_id3154320\n"
"help.text"
msgid "Divide"
-msgstr ""
+msgstr "除"
#. eUmBX
#: 02070000.xhp
@@ -7574,7 +7574,7 @@ msgctxt ""
"par_id3155417\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/divide\">Divides the values in the target cells by the values in the clipboard cells.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/divide\">用目标单元格中的值除以剪贴板上单元格中的值。</ahelp>"
#. YQPSF
#: 02070000.xhp
@@ -7583,7 +7583,7 @@ msgctxt ""
"hd_id3147048\n"
"help.text"
msgid "Options"
-msgstr ""
+msgstr "选项"
#. yJWfD
#: 02070000.xhp
@@ -7592,7 +7592,7 @@ msgctxt ""
"par_id3156283\n"
"help.text"
msgid "Sets the paste options for the clipboard contents."
-msgstr ""
+msgstr "设置剪贴板上内容的粘贴选项。"
#. rgU5u
#: 02070000.xhp
@@ -7601,7 +7601,7 @@ msgctxt ""
"hd_id3151052\n"
"help.text"
msgid "Skip empty cells"
-msgstr ""
+msgstr "跳过空白单元格"
#. ZEuoV
#: 02070000.xhp
@@ -7610,7 +7610,7 @@ msgctxt ""
"par_id3148775\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/skip_empty\">Empty cells from the clipboard do not replace target cells. If you use this option in conjunction with the \"Multiply\" or the \"Divide\" operation, the operation is not applied to the target cell of an empty cell in the clipboard.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/skip_empty\">剪贴板上的空白单元格不会取代目标单元格的已有内容。如果进行「乘」或「除」运算的同时选择此选项,则不会让剪贴板上空白单元格参与对目标单元格的运算。</ahelp>"
#. 2Duk9
#: 02070000.xhp
@@ -7619,7 +7619,7 @@ msgctxt ""
"par_id3155084\n"
"help.text"
msgid "If you select a mathematical operation and clear the <emph>Skip empty cells</emph> box, empty cells in the clipboard are treated as zeroes. For example, if you apply the <emph>Multiply</emph> operation, the target cells are filled with zeroes."
-msgstr "如果选择了数学计算,并清除了「<emph>跳过空单元格</emph>」框,则剪贴板中的空单元格将被视为零。例如,如果应用「<emph>乘法</emph>」运算,则目标单元格将由零填充。"
+msgstr "如果选择了某一运算,且没有勾选「<emph>跳过空白单元格</emph>」框,则剪贴板上的空白单元格将被当作零。例如,在应用「<emph>乘</emph>」运算时,目标单元格会填充为零。"
#. TYpT5
#: 02070000.xhp
@@ -7628,7 +7628,7 @@ msgctxt ""
"hd_id3147173\n"
"help.text"
msgid "Transpose"
-msgstr ""
+msgstr "转置"
#. yGdbE
#: 02070000.xhp
@@ -7637,7 +7637,7 @@ msgctxt ""
"par_id3147223\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/transpose\">The rows of the range in the clipboard are pasted to become columns of the output range. The columns of the range in the clipboard are pasted to become rows.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/transpose\">剪贴板上单元格区域中的各行将被粘贴为目标区域中的各列。同理,剪贴板上的列将被粘贴为行。</ahelp>"
#. WFn3f
#: 02070000.xhp
@@ -7646,7 +7646,7 @@ msgctxt ""
"hd_id3152971\n"
"help.text"
msgid "Link"
-msgstr ""
+msgstr "链接"
#. HCLBh
#: 02070000.xhp
@@ -7655,7 +7655,7 @@ msgctxt ""
"par_id3146969\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/link\">Inserts the cell range as a link, so that changes made to the cells in the source file are updated in the target file. To ensure that changes made to empty cells in the source file are updated in the target file, ensure that the \"Paste All\" option is also selected.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/link\">将单元格区域插入为链接,从而让源文件中对单元格的改动也会在目标文件中得到更新。为确保对源文件中的空白单元格所做的改动也能体现到目标文件中,请同时勾选粘贴「全部」选项。</ahelp>"
#. 5BxP6
#: 02070000.xhp
@@ -7664,7 +7664,7 @@ msgctxt ""
"par_id3145667\n"
"help.text"
msgid "You can also link sheets within the same spreadsheet. When you link to other files, a <link href=\"text/shared/00/00000005.xhp#dde\" name=\"DDE link\">DDE link</link> is automatically created. A DDE link is inserted as a matrix formula and can only be modified as a whole."
-msgstr ""
+msgstr "您也可以链接到同一电子表格中的其他工作表。当链接到其他文件时,会自动创建一个 <link href=\"text/shared/00/00000005.xhp#dde\" name=\"DDE 链接\">DDE 链接</link>。DDE 链接会以矩阵公式的形式插入,因而只能作为一个整体进行改动。"
#. QgPWJ
#: 02070000.xhp
@@ -7673,7 +7673,7 @@ msgctxt ""
"hd_id3146914\n"
"help.text"
msgid "Shift Cells"
-msgstr ""
+msgstr "移动单元格"
#. fjeGH
#: 02070000.xhp
@@ -7682,7 +7682,7 @@ msgctxt ""
"par_id3145169\n"
"help.text"
msgid "Set the shift options for the target cells when the clipboard content is inserted."
-msgstr ""
+msgstr "设置在插入剪贴板上内容时,目标单元格的移动选项。"
#. 2tqEi
#: 02070000.xhp
@@ -7691,7 +7691,7 @@ msgctxt ""
"hd_id3155518\n"
"help.text"
msgid "Don't shift"
-msgstr ""
+msgstr "不移动"
#. JLew4
#: 02070000.xhp
@@ -7700,7 +7700,7 @@ msgctxt ""
"par_id3154158\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/no_shift\">Inserted cells replace the target cells.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/no_shift\">插入的单元格将取代目标单元格。</ahelp>"
#. 7pWWW
#: 02070000.xhp
@@ -7709,7 +7709,7 @@ msgctxt ""
"hd_id3148483\n"
"help.text"
msgid "Down"
-msgstr ""
+msgstr "向下"
#. jVBVg
#: 02070000.xhp
@@ -7718,7 +7718,7 @@ msgctxt ""
"par_id3152962\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/move_down\">Target cells are shifted downward when you insert cells from the clipboard.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/move_down\">从剪贴板插入单元格时,现有的目标单元格将向下移动。</ahelp>"
#. JJojt
#: 02070000.xhp
@@ -7727,7 +7727,7 @@ msgctxt ""
"hd_id3145621\n"
"help.text"
msgid "Right"
-msgstr ""
+msgstr "向右"
#. ncgjJ
#: 02070000.xhp
@@ -7736,7 +7736,7 @@ msgctxt ""
"par_id3159264\n"
"help.text"
msgid "<ahelp hid=\"modules/scalc/ui/pastespecial/move_right\">Target cells are shifted to the right when you insert cells from the clipboard.</ahelp>"
-msgstr ""
+msgstr "<ahelp hid=\"modules/scalc/ui/pastespecial/move_right\">从剪贴板插入单元格时,现有的目标单元格将向右移动。</ahelp>"
#. 2fEf3
#: 02090000.xhp
@@ -25270,77 +25270,104 @@ msgctxt ""
msgid "Set the font size for the selected text."
msgstr "设置选中文字的字体大小。"
-#. ECPzg
+#. Gmpzb
#: 05100100.xhp
msgctxt ""
"05100100.xhp\n"
"tit\n"
"help.text"
-msgid "Merge"
-msgstr "合并"
+msgid "Merge Cells"
+msgstr ""
-#. dEoq9
+#. vrqEL
#: 05100100.xhp
msgctxt ""
"05100100.xhp\n"
-"hd_id3154765\n"
+"bm_id501632012952361\n"
+"help.text"
+msgid "<bookmark_value>merge/merging cells</bookmark_value>"
+msgstr ""
+
+#. 4qzwA
+#: 05100100.xhp
+msgctxt ""
+"05100100.xhp\n"
+"hd_id451632377983974\n"
"help.text"
-msgid "<link href=\"text/shared/01/05100100.xhp\" name=\"Merge\">Merge</link>"
-msgstr "<link href=\"text/shared/01/05100100.xhp\" name=\"Merge\">合并</link>"
+msgid "<variable id=\"mergecells\"><link href=\"text/shared/01/05100100.xhp\" name=\"Merging Cells without centering\">Merge Cells</link></variable>"
+msgstr ""
-#. tEsgH
+#. NCP7C
#: 05100100.xhp
msgctxt ""
"05100100.xhp\n"
"par_id3147406\n"
"help.text"
-msgid "<variable id=\"verbindentext\"><ahelp hid=\".\">Combines the contents of the selected table cells into a single cell.</ahelp></variable>"
-msgstr "<variable id=\"verbindentext\"><ahelp hid=\".\">将选中的表格单元格的内容合并到一个单元格中。</ahelp></variable>"
+msgid "<variable id=\"verbindentext\"><ahelp hid=\".\">Combines the contents of the selected cells into a single cell, retaining the formatting of the first cell in the selection.</ahelp></variable>"
+msgstr ""
+
+#. ip2CD
+#: 05100100.xhp
+msgctxt ""
+"05100100.xhp\n"
+"par_id461632808376973\n"
+"help.text"
+msgid "Click and drag to select the cells to be merged then do one of the following:"
+msgstr ""
-#. xDN3K
+#. bJGUQ
+#: 05100100.xhp
+msgctxt ""
+"05100100.xhp\n"
+"par_id221632803290526\n"
+"help.text"
+msgid "In the <emph>Formatting</emph> toolbar, click:"
+msgstr ""
+
+#. R8GWz
#: 05100100.xhp
msgctxt ""
"05100100.xhp\n"
"par_id3154351\n"
"help.text"
-msgid "Choose <emph>Table - Merge Cells</emph>"
-msgstr "选择「<emph>表格 - 合并单元格</emph>」"
+msgid "Or, right click the selection to open the context menu and choose <menuitem>Merge Cells</menuitem>.<br/>If <menuitem>Unmerge Cells</menuitem> is present instead then the cell selection contains merged cells and cannot be merged further."
+msgstr ""
-#. 2Z8Ap
+#. Fz6u9
#: 05100100.xhp
msgctxt ""
"05100100.xhp\n"
-"par_id3154370\n"
+"par_id931632803442925\n"
"help.text"
-msgid "On the <emph>Table</emph> Bar, click"
-msgstr "在「<emph>表格</emph>」栏中,点击"
+msgid "Or, in the <emph>Properties</emph> sidebar mark the <emph>Merge Cells</emph> checkbox."
+msgstr ""
-#. 4xBHv
+#. fsBRE
#: 05100100.xhp
msgctxt ""
"05100100.xhp\n"
-"par_id3153996\n"
+"par_id3154020\n"
"help.text"
-msgid "<image id=\"img_id3154002\" src=\"cmd/sc_mergecells.png\" width=\"0.423cm\" height=\"0.423cm\"><alt id=\"alt_id3154002\">icon</alt></image>"
-msgstr "<image id=\"img_id3154002\" src=\"cmd/sc_mergecells.png\" width=\"0.423cm\" height=\"0.423cm\"><alt id=\"alt_id3154002\">图标</alt></image>"
+msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Merge Cells</menuitem>."
+msgstr ""
-#. iBTdS
+#. tHAGa
#: 05100100.xhp
msgctxt ""
"05100100.xhp\n"
-"par_id3150662\n"
+"par_id321632377889618\n"
"help.text"
-msgid "Merge Cells"
-msgstr "合并单元格"
+msgid "Choose <emph>Table - Merge Cells</emph>.<br/>"
+msgstr ""
-#. R7DEf
+#. B7FNs
#: 05100100.xhp
msgctxt ""
"05100100.xhp\n"
-"par_id3153718\n"
+"par_id3154370\n"
"help.text"
-msgid "Merging cells can lead to calculation errors in formulas in the table."
-msgstr "合并单元格可能导致表格中的公式出现计算错误。"
+msgid "Or, on the <emph>Table</emph> toolbar click:"
+msgstr ""
#. pfYCj
#: 05100200.xhp
@@ -25351,68 +25378,131 @@ msgctxt ""
msgid "Split Cells"
msgstr "拆分单元格"
-#. ivMXF
+#. njuVE
#: 05100200.xhp
msgctxt ""
"05100200.xhp\n"
-"hd_id3154654\n"
+"bm_id501632012952361\n"
"help.text"
-msgid "<link href=\"text/shared/01/05100200.xhp\" name=\"Split Cells\">Split Cells</link>"
-msgstr "<link href=\"text/shared/01/05100200.xhp\" name=\"Split Cells\">拆分单元格</link>"
+msgid "<bookmark_value>unmerge/unmerging cells</bookmark_value> <bookmark_value>split/splitting cells</bookmark_value>"
+msgstr ""
-#. hByYt
+#. zDkKt
#: 05100200.xhp
msgctxt ""
"05100200.xhp\n"
-"par_id3083451\n"
+"hd_id621632385142590\n"
"help.text"
-msgid "<variable id=\"teilentext\"><ahelp hid=\".\">Splits the cell or group of cells horizontally or vertically into the number of cells that you enter.</ahelp></variable>"
-msgstr "<variable id=\"teilentext\"><ahelp hid=\".\">按照您输入的单元格数,水平或垂直地拆分一个或一组单元格。</ahelp></variable>"
+msgid "<variable id=\"unmergecells\"><link href=\"text/shared/01/05100200.xhp\" name=\"Unmerging Cells\">Unmerge Cells</link></variable>"
+msgstr ""
-#. Kpg6k
+#. 3oTxu
#: 05100200.xhp
msgctxt ""
"05100200.xhp\n"
-"par_id3154024\n"
+"par_id871632385128307\n"
"help.text"
-msgid "Choose <emph>Table - Split Cells</emph>"
-msgstr "选择「<emph>表格 - 拆分单元格</emph>」"
+msgid "<ahelp hid=\".\">Divides previously merged cells back to the original cells. If the original cells had content that was kept when merged that content is restored.</ahelp>"
+msgstr ""
-#. ef6va
+#. qBugU
#: 05100200.xhp
msgctxt ""
"05100200.xhp\n"
-"par_id3154042\n"
+"par_id1001632807096225\n"
"help.text"
-msgid "On the <emph>Table</emph> Bar, click"
-msgstr "在「<emph>表格</emph>」栏中,点击"
+msgid "Select the cells to be unmerged then do one of the following:"
+msgstr ""
-#. xKWAC
+#. 8HDVx
#: 05100200.xhp
msgctxt ""
"05100200.xhp\n"
-"par_id3147270\n"
+"par_id961632804418168\n"
"help.text"
-msgid "<image id=\"img_id3147275\" src=\"cmd/sc_splitcell.png\" width=\"0.423cm\" height=\"0.423cm\"><alt id=\"alt_id3147275\">Icon</alt></image>"
-msgstr "<image id=\"img_id3147275\" src=\"cmd/sc_splitcell.png\" width=\"0.423cm\" height=\"0.423cm\"><alt id=\"alt_id3147275\">图标</alt></image>"
+msgid "In the <emph>Formatting</emph> toolbar click:"
+msgstr ""
-#. GfBQk
+#. VvKDu
#: 05100200.xhp
msgctxt ""
"05100200.xhp\n"
-"par_id3150616\n"
+"par_id161632275254217\n"
"help.text"
-msgid "Split Cells"
-msgstr "拆分单元格"
+msgid "Or, right click the selection to open the context menu and choose <menuitem>Unmerge Cells</menuitem>.<br/>If <menuitem>Merge Cells</menuitem> is present instead then the cell selection does not contain any merged cells."
+msgstr ""
+
+#. WLbsk
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id901632804430738\n"
+"help.text"
+msgid "Or, in the <emph>Properties</emph> sidebar clear the <emph>Merge Cells</emph> checkbox."
+msgstr ""
+
+#. BNuGm
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id381632805680565\n"
+"help.text"
+msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Unmerge Cells</menuitem>"
+msgstr ""
+
+#. Tvbae
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"hd_id3154654\n"
+"help.text"
+msgid "<variable id=\"splitcells\"><link href=\"text/shared/01/05100200.xhp\" name=\"Splitting Cells\">Split Cells</link></variable>"
+msgstr ""
+
+#. 3sZ8J
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id3083451\n"
+"help.text"
+msgid "<variable id=\"teilentext\"><ahelp hid=\".\">Displays the Split Cells Dialog where the split can be defined as either horizontally or vertically and the number the each cell will be split into.</ahelp></variable>"
+msgstr ""
-#. tkVC9
+#. yAYPv
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id321632807186976\n"
+"help.text"
+msgid "Do one of the following:<br/>"
+msgstr ""
+
+#. KBJNC
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id3154024\n"
+"help.text"
+msgid "Choose <emph>Table - Split Cells</emph>.<br/>"
+msgstr ""
+
+#. pNAsT
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id3154042\n"
+"help.text"
+msgid "Or, on the <emph>Table</emph> toolbar click:"
+msgstr ""
+
+#. 4oLAA
#: 05100200.xhp
msgctxt ""
"05100200.xhp\n"
"hd_id3154558\n"
"help.text"
-msgid "Split cell into"
-msgstr "拆分单元格至"
+msgid "Split Cells Dialog"
+msgstr ""
#. cDdv6
#: 05100200.xhp
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 5fca510fa5b..d46b155f18c 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: 2021-09-10 23:11+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+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"
@@ -16,393 +16,6 @@ msgstr ""
"X-Generator: LibreOffice\n"
"X-POOTLE-MTIME: 1562722697.000000\n"
-#. BhD6X
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"tit\n"
-"help.text"
-msgid "Database Wizard"
-msgstr "数据库向导"
-
-#. 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>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
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN105B4\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>"
-
-#. hmups
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN105C4\n"
-"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">The Database Wizard creates a database file that contains information about a database.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">数据库向导可以创建包含有关数据库信息的数据库文件。</ahelp>"
-
-#. 4L7fe
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_id9856563\n"
-"help.text"
-msgid "The Database Wizard creates a <link href=\"text/sdatabase/dabadoc.xhp\">database file</link> that contains information about a database."
-msgstr ""
-
-#. MP58w
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN105D5\n"
-"help.text"
-msgid "Depending on the type of operation and the type of database, the Database Wizard consists of a varying number of steps."
-msgstr "视操作类型和数据库类型的不同,「数据库向导」包含的步骤数也会不同。"
-
-#. BvAbd
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN105DB\n"
-"help.text"
-msgid "If you create a new database file, the wizard contains two steps."
-msgstr "如果创建新的数据库文件,向导将包含两个步骤。"
-
-#. 75qWp
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN105DF\n"
-"help.text"
-msgid "If you open the Database Wizard to create a database file for an existing database connection, there may be more steps to specify paths, authentication information, and more."
-msgstr "如果打开「数据库向导」为现有数据库连接创建数据库文件,可能需要更多步骤,如: 指定路径、验证信息等等。"
-
-#. wFFQE
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN105F2\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">Set up text file connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">设置文本文件连接</link>"
-
-#. 73X5w
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN10601\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">Set up Microsoft Access connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">设置 Microsoft Access 连接</link>"
-
-#. ckemB
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN1062E\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">Set up ADO connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">设置 ADO 连接</link>"
-
-#. bbTEe
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN1070F\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02dbase.xhp\">Set up dBASE connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02dbase.xhp\">设置 dBASE 连接</link>"
-
-#. mM3XM
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN1063D\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">Set up JDBC connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">设置 JDBC 连接</link>"
-
-#. EB2yp
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN1064C\n"
-"help.text"
-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>"
-
-#. sSrMX
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN1066A\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC settings</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC 设置</link>"
-
-#. Jht8w
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN10679\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02spreadsheet.xhp\">Set up Spreadsheet connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02spreadsheet.xhp\">设置电子表格连接</link>"
-
-#. menWz
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"tit\n"
-"help.text"
-msgid "Database Selection"
-msgstr "选择数据库"
-
-#. cE94h
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"bm_id2082583\n"
-"help.text"
-msgid "<bookmark_value>databases; connecting (Base)</bookmark_value>"
-msgstr "<bookmark_value>数据库; 连接 (Base)</bookmark_value>"
-
-#. ZCQvJ
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1054D\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz01.xhp\">Select Database</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz01.xhp\">选择数据库</link>"
-
-#. MNcgG
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1055D\n"
-"help.text"
-msgid "<ahelp hid=\".\">Creates a new database, opens a database file, or connects to an existing database.</ahelp>"
-msgstr "<ahelp hid=\".\">创建新数据库,打开数据库文件,或连接到现有数据库。</ahelp>"
-
-#. 3gKji
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10585\n"
-"help.text"
-msgid "Create a new database"
-msgstr "创建新数据库"
-
-#. QsxqK
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10589\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select to create a new database. </ahelp>This option uses the HSQL database engine with default settings. The final page of the wizard appears next."
-msgstr "<ahelp hid=\".\">选择创建新数据库。</ahelp>此选项使用具有默认设置的 HSQL 数据库引擎。接着将出现向导的最后一页。"
-
-#. FMbMQ
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_id8584246\n"
-"help.text"
-msgid "<link href=\"http://hsqldb.org/\">External web page about HSQL</link>."
-msgstr "<link href=\"http://hsqldb.org/\">关于 HSQL 的外部 web 页</link>。"
-
-#. RzgCQ
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN105F9\n"
-"help.text"
-msgid "Open an existing database file"
-msgstr "打开现有的数据库文件。"
-
-#. SrmuV
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN105FD\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select to open a database file from a list of recently used files or from a file selection dialog.</ahelp>"
-msgstr "<ahelp hid=\".\">选择从最近使用的文件列表或文件选择对话框中打开数据库文件。</ahelp>"
-
-#. HNAd8
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10614\n"
-"help.text"
-msgid "Recently used"
-msgstr "最近使用的"
-
-#. ZGuNR
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10618\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select a database file to open from the list of recently used files. Click Finish to open the file immediately and to exit the wizard.</ahelp>"
-msgstr "<ahelp hid=\".\">从最近使用的文件列表中选择要打开的数据库文件。点击\"完成\"可立即打开文件并退出向导。</ahelp>"
-
-#. ACzer
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1062F\n"
-"help.text"
-msgid "Open"
-msgstr "打开"
-
-#. 9WBfN
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10633\n"
-"help.text"
-msgid "<ahelp hid=\".\">Opens a file selection dialog where you can select a database file. Click Open or OK in the file selection dialog to open the file immediately and to exit the wizard.</ahelp>"
-msgstr "<ahelp hid=\".\">打开文件选择对话框,您可以在其中选择数据库文件。在文件选择对话框中点击「打开」或「确定」,立即打开该文件并退出向导。</ahelp>"
-
-#. rLwWT
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1058C\n"
-"help.text"
-msgid "Connect to an existing database"
-msgstr "连接到现有数据库"
-
-#. tF4HK
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10590\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select to create a database document for an existing database connection.</ahelp>"
-msgstr "<ahelp hid=\".\">选择创建现有数据库连接的数据库文档。</ahelp>"
-
-#. M4MGu
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10593\n"
-"help.text"
-msgid "Database type"
-msgstr "数据库类型"
-
-#. jypBq
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10597\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select the database type for the existing database connection.</ahelp>"
-msgstr "<ahelp hid=\".\">选择现有数据库连接的数据库类型。</ahelp>"
-
-#. xNvnU
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1059A\n"
-"help.text"
-msgid "The Outlook, Evolution, KDE Address Book, and Seamonkey database types do not need additional information. For other database types, the wizard contains additional pages to specify the required information."
-msgstr "Outlook、Evolution、KDE 通讯簿和 Seamonkey 数据库类型不需要附加信息。对于其他数据库类型,该向导包含用于指定所需信息的附加页面。"
-
-#. 4RN7W
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10611\n"
-"help.text"
-msgid "The next wizard page is one of the following pages:"
-msgstr "下一向导页为以下页面之一:"
-
-#. vaBGS
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1061C\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">Set up text file connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">设置文本文件连接</link>"
-
-#. NEWQn
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1062B\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">Set up Microsoft Access or Microsoft Access 2007 connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">设置 Microsoft Access 或 Microsoft Access 2007 连接</link>"
-
-#. NCWx8
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1063A\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02ldap.xhp\">Set up LDAP connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02ldap.xhp\">设置 LDAP 连接</link>"
-
-#. 29mSc
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10658\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">Set up ADO connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">设置 ADO 连接</link>"
-
-#. sUX3D
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10667\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">Set up JDBC connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">设置 JDBC 连接</link>"
-
-#. BRUYG
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10676\n"
-"help.text"
-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>"
-
-#. JtGv6
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10694\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC settings</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC 设置</link>"
-
-#. A69nZ
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN106A3\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02spreadsheet.xhp\">Set up Spreadsheet connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02spreadsheet.xhp\">设置电子表格连接</link>"
-
#. SJaiE
#: dabawiz02.xhp
msgctxt ""
@@ -502,15 +115,6 @@ msgctxt ""
msgid "<ahelp hid=\".\">Select to call the <link href=\"text/shared/explorer/database/tablewizard00.xhp\">Table Wizard</link> after the Database Wizard is finished.</ahelp>"
msgstr "<ahelp hid=\".\">选择在「数据库向导」结束后调用<link href=\"text/shared/explorer/database/tablewizard00.xhp\">表格向导</link>。</ahelp>"
-#. 3xrCA
-#: dabawiz02.xhp
-msgctxt ""
-"dabawiz02.xhp\n"
-"par_idN1061A\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>"
-
#. YnZ24
#: dabawiz02access.xhp
msgctxt ""
@@ -592,15 +196,6 @@ msgctxt ""
msgid "<ahelp hid=\".\">Click to open a file selection dialog.</ahelp>"
msgstr "<ahelp hid=\".\">点击可打开文件选择对话框。</ahelp>"
-#. bjaYj
-#: dabawiz02access.xhp
-msgctxt ""
-"dabawiz02access.xhp\n"
-"par_idN10552\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>"
-
#. gjtnv
#: dabawiz02ado.xhp
msgctxt ""
@@ -772,15 +367,6 @@ msgctxt ""
msgid "A password must contain 3 to 18 characters."
msgstr "密码长度为 3 到 18 个字符。"
-#. WBFBr
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN1059C\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>"
-
#. mxSCU
#: dabawiz02dbase.xhp
msgctxt ""
@@ -835,15 +421,6 @@ msgctxt ""
msgid "<ahelp hid=\".\">Open a path selection dialog.</ahelp>"
msgstr "<ahelp hid=\".\">打开路径选择对话框。</ahelp>"
-#. Hj37d
-#: dabawiz02dbase.xhp
-msgctxt ""
-"dabawiz02dbase.xhp\n"
-"par_idN10584\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>"
-
#. n9AxK
#: dabawiz02jdbc.xhp
msgctxt ""
@@ -1114,23 +691,14 @@ msgctxt ""
msgid "<ahelp hid=\".\">Tests the connection with the current settings.</ahelp>"
msgstr "<ahelp hid=\".\">使用当前设置测试连接。</ahelp>"
-#. 6Gw68
+#. FGezr
#: dabawiz02jdbc.xhp
msgctxt ""
"dabawiz02jdbc.xhp\n"
"par_idN106E7\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">Authentication</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">验证</link>"
-
-#. cmVsm
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN106F6\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>"
+msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
+msgstr ""
#. Y4EFA
#: dabawiz02mysql.xhp
@@ -1330,23 +898,14 @@ msgctxt ""
msgid "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">JDBC Connection</link>"
msgstr "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">JDBC 连接</link>"
-#. uuyuk
+#. ujaGF
#: dabawiz02mysql.xhp
msgctxt ""
"dabawiz02mysql.xhp\n"
"par_idN10591\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">Authentication</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">验证</link>"
-
-#. E6mUz
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_idN105A0\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>"
+msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
+msgstr ""
#. HF588
#: dabawiz02odbc.xhp
@@ -1474,23 +1033,14 @@ msgctxt ""
msgid "<ahelp hid=\".\">Select a data source to which you want to connect using ODBC. Then click <emph>OK</emph>.</ahelp>"
msgstr "<ahelp hid=\".\">选择要使用 ODBC 连接的数据源。然后,点击「<emph>确定</emph>」。</ahelp>"
-#. z7ivo
+#. WaAZB
#: dabawiz02odbc.xhp
msgctxt ""
"dabawiz02odbc.xhp\n"
"par_idN10567\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">Authentication</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">验证</link>"
-
-#. 2Lnms
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_idN10576\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>"
+msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
+msgstr ""
#. RL7sk
#: dabawiz02oracle.xhp
@@ -1645,23 +1195,14 @@ msgctxt ""
msgid "<ahelp hid=\".\">Tests the connection with the current settings.</ahelp>"
msgstr "<ahelp hid=\".\">使用当前设置测试连接。</ahelp>"
-#. xAvje
+#. UwteE
#: dabawiz02oracle.xhp
msgctxt ""
"dabawiz02oracle.xhp\n"
"par_idN10637\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">Authentication</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">验证</link>"
-
-#. LEpR3
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN10646\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>"
+msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
+msgstr ""
#. XoiBM
#: dabawiz02spreadsheet.xhp
@@ -1735,15 +1276,6 @@ msgctxt ""
msgid "<ahelp hid=\".\">Select to request a password from the user of the database document.</ahelp>"
msgstr "<ahelp hid=\".\">选择从数据库文档用户请求密码。</ahelp>"
-#. BcRAT
-#: dabawiz02spreadsheet.xhp
-msgctxt ""
-"dabawiz02spreadsheet.xhp\n"
-"par_idN10553\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>"
-
#. xngE4
#: dabawiz02text.xhp
msgctxt ""
@@ -1951,114 +1483,6 @@ msgctxt ""
msgid "<ahelp hid=\".\">Enter or select the character that is used as a thousands separator in the text file, for example a comma (1,000), or a period (1.000).</ahelp>"
msgstr "<ahelp hid=\".\">输入或选择在文本文件中用作千位分隔符的字符,例如,逗号 (1,000) 或句点 (1.000)</ahelp>。"
-#. D9AZK
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN105E6\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>"
-
-#. YSNPt
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"tit\n"
-"help.text"
-msgid "Set up user authentication"
-msgstr "设置用户验证"
-
-#. EhtLD
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN1053A\n"
-"help.text"
-msgid "Set up user authentication"
-msgstr "设置用户验证"
-
-#. TGHfv
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN1053E\n"
-"help.text"
-msgid "Some databases require a user name and password."
-msgstr "部分数据库需要用户名与密码。"
-
-#. 6YqKR
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN10541\n"
-"help.text"
-msgid "User name"
-msgstr "用户名"
-
-#. q5JV4
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN10545\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter the user name to access the database.</ahelp>"
-msgstr "<ahelp hid=\".\">输入访问数据库的用户名。</ahelp>"
-
-#. cAFEU
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN10548\n"
-"help.text"
-msgid "Password required"
-msgstr "要求输入密码"
-
-#. wctGK
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN1054C\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select to prompt a user for a password to access the database.</ahelp>"
-msgstr "<ahelp hid=\".\">选择提示用户在访问数据库时输入密码。</ahelp>"
-
-#. xnkR8
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN10549\n"
-"help.text"
-msgid "Test Connection"
-msgstr "测试连接"
-
-#. jkqUK
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN10546\n"
-"help.text"
-msgid "<ahelp hid=\".\">Check if the configured connection can be used to access the database.</ahelp>"
-msgstr "<ahelp hid=\".\">测试配置的连接是否可用于访问数据库。</ahelp>"
-
-#. 9d4Bh
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN1054F\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02.xhp\">Save and proceed</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02.xhp\">保存并继续操作</link>"
-
-#. f9faN
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN10566\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>"
-
#. rw2xT
#: menubar.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/shared/guide.po b/source/zh-CN/helpcontent2/source/text/shared/guide.po
index f8b7da09d72..40fc7a3d5db 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: 2021-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
"PO-Revision-Date: 2021-02-17 15:04+0000\n"
"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
"Language-Team: Chinese (Simplified) <https://translations.documentfoundation.org/projects/libo_help-master/textsharedguide/zh_Hans/>\n"
@@ -790,13 +790,13 @@ msgctxt ""
msgid "Continue redacting other portions of the generated document and then print or export it to PDF."
msgstr ""
-#. gnseq
+#. AGQiE
#: auto_redact.xhp
msgctxt ""
"auto_redact.xhp\n"
"par_id581626101004089\n"
"help.text"
-msgid "Refer to the help page <embedvar href=\"text/shared/01/02100001.xhp#02100001\"/> to learn more about regular expressions."
+msgid "Refer to the help page <link href=\"text/shared/01/02100001.xhp\" name=\"regex_link\">List of Regular Expressions</link> to learn more about how to use regular expressions in %PRODUCTNAME."
msgstr ""
#. AE55E
@@ -6586,14 +6586,14 @@ msgctxt ""
msgid "Open a Base file of the database type that you want."
msgstr "打开所需数据库类型的 Base 文件。"
-#. bVf6R
+#. fGBzV
#: data_im_export.xhp
msgctxt ""
"data_im_export.xhp\n"
"par_id7869502\n"
"help.text"
-msgid "Either create a new Base file using the <link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>, or open any existing Base file that is not read-only."
-msgstr "使用<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>创建新的 Base 文件,或打开任意一个现有的非只读 Base 文件。"
+msgid "Either create a new Base file using the <link href=\"text/sdatabase/dabawiz01.xhp\">Database Wizard</link>, or open any existing Base file that is not read-only."
+msgstr ""
#. JHYC6
#: data_im_export.xhp
@@ -6712,14 +6712,14 @@ msgctxt ""
msgid "Choose <emph>File - New - Database</emph>."
msgstr "选择「<emph>文件 - 新建 - 数据库</emph>」。"
-#. FMZud
+#. BsTGf
#: data_new.xhp
msgctxt ""
"data_new.xhp\n"
"par_idN105CB\n"
"help.text"
-msgid "This opens the <link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>, where you create a new database file."
-msgstr "这样可打开<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>,利用该向导可创建新的数据库文件。"
+msgid "This opens the <link href=\"text/sdatabase/dabawiz01.xhp\">Database Wizard</link>, where you create a new database file."
+msgstr ""
#. zTCBz
#: data_new.xhp
@@ -8215,22 +8215,22 @@ msgctxt ""
msgid "Choose <menuitem>Tools - Development Tools</menuitem>"
msgstr ""
-#. XaydF
+#. EcEEb
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id271627931218557\n"
"help.text"
-msgid "After <emph>Development Tools</emph> is enabled it will become visible in all documents and %PRODUCTNAME applications. This setting is persistent and the <emph>Development Tools</emph> will remain visible until it is explicitly disabled by choosing <menuitem>Tools - Development Tools</menuitem>."
+msgid "The <emph>Development Tools</emph> are visible in all documents of %PRODUCTNAME Writer, Calc, Impress and Draw. The display is persistent and remain visible until deselected."
msgstr ""
-#. D74vk
+#. YrKDj
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id3152821\n"
"help.text"
-msgid "When <emph>Development Tools</emph> is enabled, a dockable window will be shown at the bottom of the screen. This window has two main sections:"
+msgid "When <emph>Development Tools</emph> is enabled, a dockable window is shown at the bottom of the screen. This window has two sections:"
msgstr ""
#. BbGGE
@@ -8251,13 +8251,13 @@ msgctxt ""
msgid "<emph>Object inspection panel:</emph> Displays the available services, methods, properties and interfaces of the selected object."
msgstr ""
-#. SfCJQ
+#. fiPDo
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id91627862617231\n"
"help.text"
-msgid "This feature is available since %PRODUCTNAME 7.2 and can be used in Writer, Calc, Impress and Draw."
+msgid "This feature is available since %PRODUCTNAME 7.2 for Writer, Calc, Impress and Draw."
msgstr ""
#. 5J2jc
@@ -8287,22 +8287,22 @@ msgctxt ""
msgid "The behavior of the tree view depends on the status of the <emph>Current Selection</emph> toggle button:"
msgstr ""
-#. CjDg6
+#. CJUxG
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id811627912238786\n"
"help.text"
-msgid "If <emph>Current Selection</emph> is <emph>enabled</emph>, then the <emph>Object Inspection Panel</emph> will display the properties of the object that is currently selected in the document. Hence, clicking any item in the tree view will have no effect."
+msgid "Click on <emph>Current Selection</emph> to display the properties of the object currently selected in the document. Hence, clicking any item in the tree view have no effect."
msgstr ""
-#. 8sDyd
+#. C3mpn
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id721627912239053\n"
"help.text"
-msgid "If <emph>Current Selection</emph> is <emph>disabled</emph>, then clicking any item in the tree view will update the contents of the <emph>Object Inspection Panel</emph>."
+msgid "Click on <emph>Current Selection</emph> again to display any item in the tree view and update the contents of the <emph>Object Inspection Panel</emph>."
msgstr ""
#. PmkTZ
@@ -8332,15 +8332,6 @@ msgctxt ""
msgid "Supported objects"
msgstr ""
-#. c5tx6
-#: dev_tools.xhp
-msgctxt ""
-"dev_tools.xhp\n"
-"par_id551627912559559\n"
-"help.text"
-msgid "Writer"
-msgstr ""
-
#. meXjs
#: dev_tools.xhp
msgctxt ""
@@ -8350,15 +8341,6 @@ msgctxt ""
msgid "Paragraphs<br/>Text Portions in a Paragraph<br/>Shapes<br/>Tables<br/>Frames<br/>Graphic Objects<br/>Embedded Objects (OLE)<br/>Style Families and Styles"
msgstr ""
-#. KrHuw
-#: dev_tools.xhp
-msgctxt ""
-"dev_tools.xhp\n"
-"par_id171627912693619\n"
-"help.text"
-msgid "Calc"
-msgstr ""
-
#. SHryG
#: dev_tools.xhp
msgctxt ""
@@ -8368,15 +8350,6 @@ msgctxt ""
msgid "Sheets<br/>Shapes per sheet<br/>Charts per sheet<br/>Pivot tables per sheet<br/>Style Families and Styles"
msgstr ""
-#. c5S5D
-#: dev_tools.xhp
-msgctxt ""
-"dev_tools.xhp\n"
-"par_id711627912898951\n"
-"help.text"
-msgid "Impress"
-msgstr ""
-
#. G7tq6
#: dev_tools.xhp
msgctxt ""
@@ -8386,15 +8359,6 @@ msgctxt ""
msgid "Slides<br/>Shapes per slide<br/>Master slides<br/>Style Families and Styles"
msgstr ""
-#. APvko
-#: dev_tools.xhp
-msgctxt ""
-"dev_tools.xhp\n"
-"par_id711627912898022\n"
-"help.text"
-msgid "Draw"
-msgstr ""
-
#. QBNop
#: dev_tools.xhp
msgctxt ""
@@ -8413,49 +8377,49 @@ msgctxt ""
msgid "Object Inspection Panel"
msgstr ""
-#. cP4WT
+#. ULvie
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id571627913372273\n"
"help.text"
-msgid "The right side of the window consists of the <emph>Object Inspection Panel</emph> that displays information about the object being inspected."
+msgid "The right side of the window is the <emph>Object Inspection Panel</emph> that displays information about the object being inspected."
msgstr ""
-#. CGBzb
+#. KJDUA
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id361627930602108\n"
"help.text"
-msgid "The first piece of information available is the <emph>Class Name</emph>, which is the name of the implementation class of the object."
+msgid "<emph>Class Name</emph>: is the name of the object class."
msgstr ""
-#. aF94B
+#. TbDBD
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id111627931046662\n"
"help.text"
-msgid "Use the <emph>class name</emph> to search more information in the API documentation. For example, the top-level object in a Writer document is an instance of the class <emph>SwXTextDocument</emph>, which is documented at <link href=\"https://docs.libreoffice.org/sw/html/classSwXTextDocument.html\" name=\"SwXTextDocument_API\">SwXTextDocument Class Reference</link>."
+msgid "Use the class name to search more information in the API documentation. For example, the top-level object in a Writer document is an instance of the class <emph>SwXTextDocument</emph>, which is documented at <link href=\"https://docs.libreoffice.org/sw/html/classSwXTextDocument.html\" name=\"SwXTextDocument_API\">SwXTextDocument Class Reference</link>."
msgstr ""
-#. X9o8G
+#. 7g3wB
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id371627930700568\n"
"help.text"
-msgid "It is possible to inspect the object further by using the four tabs available that display its <emph>Interfaces</emph>, <emph>Services</emph>, <emph>Properties</emph> and <emph>Methods</emph>."
+msgid "You can inspect the object further by using the four tabs available that display its <emph>Interfaces</emph>, <emph>Services</emph>, <emph>Properties</emph> and <emph>Methods</emph>."
msgstr ""
-#. AwMan
+#. hd4cE
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id71627913884995\n"
"help.text"
-msgid "Each of the tabs organize the information about the object in columns. The set of columns presented depend on which tab is selected."
+msgid "The information about the object is organized in columns in each tab. The set of columns displayed depend on the selected tab."
msgstr ""
#. RECVL
@@ -8512,22 +8476,22 @@ msgctxt ""
msgid "Contains four columns that describe the properties of the object:"
msgstr ""
-#. VyG2A
+#. eNhy9
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id461627914264898\n"
"help.text"
-msgid "<emph>Property</emph>: Shows the names of all properties that can be inspected."
+msgid "<emph>Property</emph>: Shows the names of the object properties."
msgstr ""
-#. YBmE7
+#. hDfcB
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id491627914265327\n"
"help.text"
-msgid "<emph>Value</emph>: Displays a textual representation of the values of all properties."
+msgid "<emph>Value</emph>: Displays a textual representation of the current property value."
msgstr ""
#. 7P4rv
@@ -8539,22 +8503,22 @@ msgctxt ""
msgid "<emph>Type</emph>: Shows the property type."
msgstr ""
-#. FYv4W
+#. VxeGP
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id391627914265992\n"
"help.text"
-msgid "<emph>Info</emph>: Presents relevant information about the property. For instance, a property that is read-only will have a \"read-only\" value in this column."
+msgid "<emph>Info</emph>: display relevant information about the property. For example, a read-only property displays \"read-only\" in this column."
msgstr ""
-#. G2CGc
+#. L6iHf
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id161627914138859\n"
"help.text"
-msgid "The <emph>Properties</emph> tab contains an additional section that shows a textual representation of the value of the selected property. When a property is selected the value is updated in the text box available at the bottom of the <emph>Object Inspection Panel</emph>. This is useful when the value is too long to be shown in the <emph>Value</emph> column."
+msgid "The <emph>Properties</emph> tab also includes a text box on the bottom to display the full textual representation of the property value."
msgstr ""
#. ptFVa
@@ -8575,22 +8539,22 @@ msgctxt ""
msgid "Contains four columns that describe the combined list of methods that can be called by the current object:"
msgstr ""
-#. Bq4dK
+#. iFvEX
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id281627914839271\n"
"help.text"
-msgid "<emph>Method</emph>: Shows the names of all properties that can be inspected."
+msgid "<emph>Method</emph>: Shows the names of all methods of the object."
msgstr ""
-#. kxBZz
+#. hFE8H
#: dev_tools.xhp
msgctxt ""
"dev_tools.xhp\n"
"par_id421627914839748\n"
"help.text"
-msgid "<emph>Return type</emph>: Displays the return type of the methods that can be called by the object. Methods that do not return any value are marked as \"void\" in this column."
+msgid "<emph>Return type</emph>: Displays the return type of the object methods. Methods that do not return any value are marked as \"void\" in this column."
msgstr ""
#. NwGtg
diff --git a/source/zh-CN/helpcontent2/source/text/shared/menu.po b/source/zh-CN/helpcontent2/source/text/shared/menu.po
index db78638384a..003478e9133 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/menu.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/menu.po
@@ -4,16 +4,16 @@ 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-11-08 19:34+0100\n"
-"PO-Revision-Date: 2019-03-19 06:44+0000\n"
-"Last-Translator: Dian LI <xslidian@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: zh_CN\n"
+"PO-Revision-Date: 2021-10-04 18:05+0000\n"
+"Last-Translator: 锁琨珑 <suokunlong@126.com>\n"
+"Language-Team: Chinese (Simplified) <https://translations.documentfoundation.org/projects/libo_help-master/textsharedmenu/zh_Hans/>\n"
+"Language: zh-CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Accelerator-Marker: ~\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Weblate 4.8.1\n"
"X-POOTLE-MTIME: 1552977892.000000\n"
#. EEMss
@@ -50,7 +50,7 @@ msgctxt ""
"tit\n"
"help.text"
msgid "Form Control Menu"
-msgstr ""
+msgstr "表单菜单"
#. fxAGy
#: insert_form_control.xhp
@@ -167,7 +167,7 @@ msgctxt ""
"tit\n"
"help.text"
msgid "Save Image"
-msgstr ""
+msgstr "保存图像"
#. sn5hM
#: save_image.xhp
@@ -176,7 +176,7 @@ msgctxt ""
"bm_id561566144886972\n"
"help.text"
msgid "<bookmark_value>page;save background image</bookmark_value> <bookmark_value>slide;save background image</bookmark_value> <bookmark_value>page background image;save</bookmark_value> <bookmark_value>slide background image;save</bookmark_value>"
-msgstr ""
+msgstr "<bookmark_value>页面;保存背景图像</bookmark_value> <bookmark_value>幻灯片;保存背景图像</bookmark_value> <bookmark_value>页面背景图像;保存</bookmark_value> <bookmark_value>幻灯片背景图像;保存</bookmark_value>"
#. vT85b
#: save_image.xhp
@@ -185,7 +185,7 @@ msgctxt ""
"hd_id881566143431255\n"
"help.text"
msgid "<link href=\"text/shared/menu/save_image.xhp\" name=\"savebackgroundimage\">Save Background Image</link>"
-msgstr ""
+msgstr "<link href=\"text/shared/menu/save_image.xhp\" name=\"savebackgroundimage\"> 保存背景图像</link>"
#. qWmcs
#: save_image.xhp
@@ -194,7 +194,7 @@ msgctxt ""
"par_id121566143431256\n"
"help.text"
msgid "<variable id=\"variable name\"><ahelp hid=\".uno:SaveBackground\">Saves the background image of the current <switchinline select=\"appl\"><caseinline select=\"IMPRESS\">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</ahelp></variable>"
-msgstr ""
+msgstr "<variable id=\"variable name\"><ahelp hid=\".uno:SaveBackground\">保存当前 <switchinline select=\"appl\"><caseinline select=\"IMPRESS\">幻灯片</caseinline><defaultinline>页面</defaultinline></switchinline>中的背景图像。</ahelp></variable>"
#. Y5Mt5
#: save_image.xhp
@@ -203,7 +203,7 @@ msgctxt ""
"par_id91566150694760\n"
"help.text"
msgid "Choose <switchinline select=\"appl\"><caseinline select=\"IMPRESS\"><menuitem>Slide</menuitem></caseinline><defaultinline><menuitem>Page</menuitem></defaultinline></switchinline> - <menuitem>Save Background Image</menuitem>."
-msgstr ""
+msgstr "选择 <switchinline select=\"appl\"><caseinline select=\"IMPRESS\"><menuitem>幻灯片</menuitem></caseinline><defaultinline><menuitem>页面</menuitem></defaultinline></switchinline> - <menuitem>保存背景图像</menuitem>。"
#. V2Dps
#: save_image.xhp
@@ -212,7 +212,7 @@ msgctxt ""
"par_id291566144541584\n"
"help.text"
msgid "Opens the <emph>Export Image</emph> dialog to save the background image of the current <switchinline select=\"appl\"><caseinline select=\"IMPRESS\">slide</caseinline><defaultinline>page</defaultinline></switchinline>. Select the image file format in the Filter box, enter a file name for the image and click <emph>Save</emph>."
-msgstr ""
+msgstr "这将打开 <emph>导出图像</emph> 对话框, 以保存当前 <switchinline select=\"appl\"><caseinline select=\"IMPRESS\">幻灯片</caseinline><defaultinline>页面</defaultinline></switchinline>中的背景图像。在文件格式下拉列表中选择您要保存的图像格式,输入文件名,然后单击 <emph>保存</emph>。"
#. LJVBr
#: save_image.xhp
@@ -221,7 +221,7 @@ msgctxt ""
"par_id841566144548379\n"
"help.text"
msgid "Depending on the file format chosen, a dialog appears to set the image format properties."
-msgstr ""
+msgstr "之后,取决于您选择的图像文件格式,可能会出现一个对话框以允许您设置图像的属性。"
#. QZF9R
#: set_image_background.xhp
@@ -230,7 +230,7 @@ msgctxt ""
"tit\n"
"help.text"
msgid "Set Image Background"
-msgstr ""
+msgstr "设置背景图像"
#. Pyf3s
#: set_image_background.xhp
@@ -239,7 +239,7 @@ msgctxt ""
"bm_id561566144886972\n"
"help.text"
msgid "<bookmark_value>page;set background image</bookmark_value><bookmark_value>slide;set background image</bookmark_value><bookmark_value>page background image;set</bookmark_value><bookmark_value>slide background image;set</bookmark_value>"
-msgstr ""
+msgstr "<bookmark_value>页面;设置背景图像</bookmark_value><bookmark_value>幻灯片;设置背景图像</bookmark_value><bookmark_value>页面背景图像;设置</bookmark_value><bookmark_value>幻灯片背景图像;设置</bookmark_value>"
#. GYiBH
#: set_image_background.xhp
@@ -248,7 +248,7 @@ msgctxt ""
"hd_id881566143431255\n"
"help.text"
msgid "<link href=\"text/shared/menu/set_image_background.xhp\" name=\"setbackgroundimage\">Set Background Image</link>"
-msgstr ""
+msgstr "<link href=\"text/shared/menu/set_image_background.xhp\" name=\"setbackgroundimage\">设置背景图像</link>"
#. B8FvH
#: set_image_background.xhp
@@ -257,7 +257,7 @@ msgctxt ""
"par_id121566143431256\n"
"help.text"
msgid "<variable id=\"setimagebackground\"><ahelp hid=\".uno:SelectBackground\">Set the image background of the <switchinline select=\"appl\"><caseinline select=\"IMPRESS\">slide</caseinline><defaultinline>page</defaultinline></switchinline>.</ahelp></variable>"
-msgstr ""
+msgstr "<variable id=\"setimagebackground\"><ahelp hid=\".uno:SelectBackground\">设置<switchinline select=\"appl\"><caseinline select=\"IMPRESS\">幻灯片</caseinline><defaultinline>页面</defaultinline></switchinline>的背景图像。</ahelp></variable>"
#. j4B9R
#: set_image_background.xhp
@@ -266,7 +266,7 @@ msgctxt ""
"par_id91566150694760\n"
"help.text"
msgid "Choose <switchinline select=\"appl\"><caseinline select=\"IMPRESS\"><menuitem>Slide</menuitem></caseinline><defaultinline><menuitem>Page</menuitem></defaultinline></switchinline> - <menuitem>Set Background Image</menuitem>."
-msgstr ""
+msgstr "选择<switchinline select=\"appl\"><caseinline select=\"IMPRESS\"><menuitem>幻灯片</menuitem></caseinline><defaultinline><menuitem>页面</menuitem></defaultinline></switchinline> - <menuitem>设置背景图像</menuitem>。"
#. DU4B8
#: set_image_background.xhp
@@ -275,4 +275,4 @@ msgctxt ""
"par_id291566144541584\n"
"help.text"
msgid "Opens the <emph>Set Image Background</emph> dialog to set the background image of the current <switchinline select=\"appl\"><caseinline select=\"IMPRESS\">slide</caseinline><defaultinline>page</defaultinline></switchinline>. Select image file and press Open."
-msgstr ""
+msgstr "这将打开<emph>设置背景图像</emph>对话框,以设置当前<switchinline select=\"appl\"><caseinline select=\"IMPRESS\">幻灯片</caseinline><defaultinline>页面</defaultinline></switchinline>的背景图像。选择一个图像文件,然后点击“打开”。"
diff --git a/source/zh-CN/helpcontent2/source/text/simpress/guide.po b/source/zh-CN/helpcontent2/source/text/simpress/guide.po
index 1abfb7a7c6f..65394259732 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: 2021-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+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"
@@ -5866,24 +5866,6 @@ msgctxt ""
msgid "<ahelp hid=\".\" visibility=\"hidden\">Define the vertical alignment of selected or all cell contents. Split or merge cells.</ahelp>"
msgstr "<ahelp hid=\".\" visibility=\"hidden\">为选中的或所有单元格内容定义垂直对齐方式。拆分或合并单元格。</ahelp>"
-#. HAWie
-#: table_insert.xhp
-msgctxt ""
-"table_insert.xhp\n"
-"par_id0916200803551553\n"
-"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">All selected cells are merged into one cell.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">所有选中的单元格被合并成为一个单元格。</ahelp>"
-
-#. dP7mX
-#: table_insert.xhp
-msgctxt ""
-"table_insert.xhp\n"
-"par_id0916200803551535\n"
-"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">The selected cell is split into several cells. You see the Split Cells dialog box.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">选中的单元格被拆分成几个单元格。您会看到「拆分单元格」对话框。</ahelp>"
-
#. 5hutM
#: table_insert.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 715b09fe337..72e927d8cb1 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: 2021-09-10 23:11+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+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"
@@ -2212,14 +2212,14 @@ msgctxt ""
msgid "<image id=\"img_id3147275\" src=\"cmd/sc_splitcell.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3147275\">Icon</alt></image>"
msgstr "<image id=\"img_id3147275\" src=\"cmd/sc_splitcell.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3147275\">图标</alt></image>"
-#. fCPij
+#. 7XaPo
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3150616\n"
"help.text"
-msgid "Split Cells"
-msgstr "拆分单元格"
+msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Unmerge Cells</caseinline><defaultinline>Split Cells</defaultinline></switchinline>"
+msgstr ""
#. BGm4B
#: 00000405.xhp