aboutsummaryrefslogtreecommitdiff
path: root/source/zh-CN/helpcontent2
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2021-03-23 12:34:36 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2021-03-23 12:41:21 +0100
commit943a62baf90a015aac8846f3b8d88c8a49787fe7 (patch)
treeb95adb6c329320d3656e8d7f0bed56de459fd56b /source/zh-CN/helpcontent2
parentff06bb650ac32a415815345a1fd4184a8fc311d4 (diff)
update translations for master
and force-fix errors using pocheck Change-Id: I2afa643ae8af893ee3fce0009bcfac545a12b6f3
Diffstat (limited to 'source/zh-CN/helpcontent2')
-rw-r--r--source/zh-CN/helpcontent2/source/text/sbasic/python.po18
-rw-r--r--source/zh-CN/helpcontent2/source/text/sbasic/shared.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/sbasic/shared/03.po3703
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/00.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/scalc/01.po75
-rw-r--r--source/zh-CN/helpcontent2/source/text/sdatabase.po465
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/00.po190
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/01.po238
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/02.po102
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/04.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/explorer/database.po602
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/guide.po82
-rw-r--r--source/zh-CN/helpcontent2/source/text/shared/optionen.po36
-rw-r--r--source/zh-CN/helpcontent2/source/text/simpress.po480
-rw-r--r--source/zh-CN/helpcontent2/source/text/simpress/00.po6
-rw-r--r--source/zh-CN/helpcontent2/source/text/simpress/01.po38
-rw-r--r--source/zh-CN/helpcontent2/source/text/simpress/guide.po42
-rw-r--r--source/zh-CN/helpcontent2/source/text/smath/01.po60
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter.po64
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/00.po32
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/01.po232
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/02.po321
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/04.po20
-rw-r--r--source/zh-CN/helpcontent2/source/text/swriter/guide.po392
24 files changed, 5561 insertions, 1655 deletions
diff --git a/source/zh-CN/helpcontent2/source/text/sbasic/python.po b/source/zh-CN/helpcontent2/source/text/sbasic/python.po
index 3873158b555..b74fface2eb 100644
--- a/source/zh-CN/helpcontent2/source/text/sbasic/python.po
+++ b/source/zh-CN/helpcontent2/source/text/sbasic/python.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-02-22 17:17+0100\n"
+"POT-Creation-Date: 2021-03-19 17:31+0100\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"
@@ -169,13 +169,13 @@ msgctxt ""
msgid "It is recommended to have knowledge of Python standard modules and %PRODUCTNAME API features prior to perform inter-language calls from Python to Basic, JavaScript or any other script engine."
msgstr ""
-#. yXTrk
+#. Sffwq
#: python_2_basic.xhp
msgctxt ""
"python_2_basic.xhp\n"
"N0338\n"
"help.text"
-msgid "When running Python scripts from an Integrated Development Environment (IDE), the %PRODUCTNAME nested Basic engine may be absent. Avoid Python to %PRODUCTNAME Basic calls in such context. However Python environment and Universal Networks Objects (UNO) are fully available. Refer to <link href=\"text/sbasic/python/python_ide.xhp\" name=\"Setting Up an Integrated IDE for Python\">Setting Up an Integrated IDE for Python</link> for more information."
+msgid "When running Python scripts from an Integrated Development Environment (IDE), the %PRODUCTNAME-embedded Basic engine may be absent. Avoid Python-to-%PRODUCTNAME Basic calls in such contexts. However Python environment and Universal Networks Objects (UNO) are fully available. Refer to <link href=\"text/sbasic/python/python_ide.xhp\" name=\"Setting Up an Integrated IDE for Python\">Setting Up an Integrated IDE for Python</link> for more information."
msgstr ""
#. NcuDF
@@ -448,14 +448,14 @@ msgctxt ""
msgid "My Macros or %PRODUCTNAME Macros dialogs"
msgstr "「我的宏」或「%PRODUCTNAME 宏」对话框"
-#. jCE4m
+#. pcUEy
#: python_dialogs.xhp
msgctxt ""
"python_dialogs.xhp\n"
"N0339\n"
"help.text"
-msgid "The examples below open <literal>Access2Base Trace</literal> console or the imported <literal>TutorialsDialog</literal> dialog with <menuitem>Tools – Macros – Run Macro...</menuitem> menu:"
-msgstr "下面的示例打开<literal>Access2Base 跟踪</literal>控制台或通过<literal>工具 – 宏 – 运行宏...</literal>导入的<menuitem>TutorialsDialog</menuitem> 对话框:"
+msgid "The examples below open <literal>Access2Base Trace</literal> console or the imported <literal>TutorialsDialog</literal> dialog with <menuitem>Tools - Macros - Run Macro</menuitem> menu:"
+msgstr ""
#. ChW9B
#: python_dialogs.xhp
@@ -466,14 +466,14 @@ msgctxt ""
msgid "Document embedded dialogs"
msgstr "文档中嵌入的对话框"
-#. SsPGJ
+#. uHH6H
#: python_dialogs.xhp
msgctxt ""
"python_dialogs.xhp\n"
"N0365\n"
"help.text"
-msgid "The example below opens a newly edited <literal>Dialog1</literal> dialog from a document with <menuitem>Tools – Macros – Run Macro...</menuitem> menu:"
-msgstr "下例将通过「<literal>工具 – 宏 – 运行宏...</literal>」菜单在文档中打开新近编辑的「<menuitem>对话框1</menuitem>」对话框:"
+msgid "The example below opens a newly edited <literal>Dialog1</literal> dialog from a document with <menuitem>Tools - Macros - Run Macro</menuitem> menu:"
+msgstr ""
#. mMo7w
#: python_dialogs.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/sbasic/shared.po b/source/zh-CN/helpcontent2/source/text/sbasic/shared.po
index 93183469c41..aec29dd4228 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-02-22 17:17+0100\n"
+"POT-Creation-Date: 2021-03-19 17:31+0100\n"
"PO-Revision-Date: 2019-07-10 04:02+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4741,13 +4741,13 @@ msgctxt ""
msgid "-no UI-"
msgstr ""
-#. FsrLe
+#. AUk3A
#: 01040000.xhp
msgctxt ""
"01040000.xhp\n"
"par_id961599839198859\n"
"help.text"
-msgid "When the document disk location has changed, for example after a <emph>File - Save As...</emph> action."
+msgid "When the document disk location has changed, for example after a <emph>File - Save As</emph> action."
msgstr ""
#. n5TCf
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 4a0fc5f3125..e7b88a6947e 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-02-22 17:17+0100\n"
+"POT-Creation-Date: 2021-03-23 11:44+0100\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"
@@ -16,6 +16,87 @@ msgstr ""
"X-Generator: LibreOffice\n"
"X-POOTLE-MTIME: 1559438286.000000\n"
+#. ViEWM
+#: avail_release.xhp
+msgctxt ""
+"avail_release.xhp\n"
+"tit\n"
+"help.text"
+msgid "(Un)Available since release"
+msgstr ""
+
+#. CeSww
+#: avail_release.xhp
+msgctxt ""
+"avail_release.xhp\n"
+"not_BasMeth\n"
+"help.text"
+msgid "This method is not available in Basic."
+msgstr ""
+
+#. LDXQx
+#: avail_release.xhp
+msgctxt ""
+"avail_release.xhp\n"
+"not_BasProp\n"
+"help.text"
+msgid "This property is not available in Basic."
+msgstr ""
+
+#. 4GDXo
+#: avail_release.xhp
+msgctxt ""
+"avail_release.xhp\n"
+"not_PycMeth\n"
+"help.text"
+msgid "This method is not available in Python."
+msgstr ""
+
+#. 3ZUdq
+#: avail_release.xhp
+msgctxt ""
+"avail_release.xhp\n"
+"not_PycProp\n"
+"help.text"
+msgid "This property is not available in Python."
+msgstr ""
+
+#. GXE45
+#: avail_release.xhp
+msgctxt ""
+"avail_release.xhp\n"
+"par_id281613660174140\n"
+"help.text"
+msgid "These methods are available from %PRODUCTNAME 7.2 onwards."
+msgstr ""
+
+#. qjuHF
+#: avail_release.xhp
+msgctxt ""
+"avail_release.xhp\n"
+"par_id981613655373210\n"
+"help.text"
+msgid "This control is available from %PRODUCTNAME 7.2 onwards."
+msgstr ""
+
+#. bAYUN
+#: avail_release.xhp
+msgctxt ""
+"avail_release.xhp\n"
+"par_id831613654401663\n"
+"help.text"
+msgid "These event properties are available from %PRODUCTNAME 7.2 onwards."
+msgstr ""
+
+#. kVj8c
+#: avail_release.xhp
+msgctxt ""
+"avail_release.xhp\n"
+"par_id201613654395537\n"
+"help.text"
+msgid "This property is available from %PRODUCTNAME 7.2 onwards."
+msgstr ""
+
#. EziC4
#: lib_ScriptForge.xhp
msgctxt ""
@@ -43,15 +124,6 @@ msgctxt ""
msgid "<bookmark_value>BASIC ScriptForge library</bookmark_value>"
msgstr ""
-#. MHX92
-#: lib_ScriptForge.xhp
-msgctxt ""
-"lib_ScriptForge.xhp\n"
-"par_id901528999850603\n"
-"help.text"
-msgid "<embedvar href=\"text/sbasic/shared/00000003.xhp#basiclibrarynote\" markup=\"keep\"/><br/> <item type=\"literal\">GlobalScope.BasicLibraries.LoadLibrary(\"ScriptForge\")</item>"
-msgstr ""
-
#. WLejn
#: lib_ScriptForge.xhp
msgctxt ""
@@ -79,15 +151,69 @@ msgctxt ""
msgid "The <literal>ScriptForge</literal> Basic library is available from %PRODUCTNAME 7.1 onwards."
msgstr ""
-#. acPUv
+#. Depaw
#: lib_ScriptForge.xhp
msgctxt ""
"lib_ScriptForge.xhp\n"
-"par_id891611613601554\n"
+"hd_id851613836643580\n"
"help.text"
msgid "Services provided by the ScriptForge library"
msgstr ""
+#. dw2Fe
+#: lib_ScriptForge.xhp
+msgctxt ""
+"lib_ScriptForge.xhp\n"
+"par_id131613838858931\n"
+"help.text"
+msgid "Category"
+msgstr ""
+
+#. TmFbF
+#: lib_ScriptForge.xhp
+msgctxt ""
+"lib_ScriptForge.xhp\n"
+"par_id441613838858931\n"
+"help.text"
+msgid "Services"
+msgstr ""
+
+#. ZZKBq
+#: lib_ScriptForge.xhp
+msgctxt ""
+"lib_ScriptForge.xhp\n"
+"par_id851613847558931\n"
+"help.text"
+msgid "%PRODUCTNAME Basic"
+msgstr ""
+
+#. jv7Z3
+#: lib_ScriptForge.xhp
+msgctxt ""
+"lib_ScriptForge.xhp\n"
+"par_id131613838825831\n"
+"help.text"
+msgid "Document Content"
+msgstr ""
+
+#. 8fZtg
+#: lib_ScriptForge.xhp
+msgctxt ""
+"lib_ScriptForge.xhp\n"
+"par_id131613947858931\n"
+"help.text"
+msgid "User Interface"
+msgstr ""
+
+#. dAomL
+#: lib_ScriptForge.xhp
+msgctxt ""
+"lib_ScriptForge.xhp\n"
+"par_id131613866258931\n"
+"help.text"
+msgid "Utilities"
+msgstr ""
+
#. 6gvZc
#: lib_ScriptForge.xhp
msgctxt ""
@@ -178,13 +304,13 @@ msgctxt ""
msgid "Its entry points are:"
msgstr ""
-#. SBNCb
+#. puNwN
#: lib_euro.xhp
msgctxt ""
"lib_euro.xhp\n"
"par_id381593519742529\n"
"help.text"
-msgid "Selecting the <emph>Euro Converter…</emph> wizard loads the following libraries in memory:"
+msgid "Selecting the <emph>Euro Converter</emph> wizard loads the following libraries in memory:"
msgstr ""
#. TGAHA
@@ -268,13 +394,13 @@ msgctxt ""
msgid "Description"
msgstr ""
-#. kN4F6
+#. ewcAB
#: lib_gimmicks.xhp
msgctxt ""
"lib_gimmicks.xhp\n"
"par_id921593518140986\n"
"help.text"
-msgid "The <emph>Gimmicks</emph> library is used by the <emph>AutoText...</emph> wizard."
+msgid "The <emph>Gimmicks</emph> library is used by the <emph>AutoText</emph> wizard."
msgstr ""
#. kHzUe
@@ -358,13 +484,13 @@ msgctxt ""
msgid "Description"
msgstr ""
-#. asxd6
+#. Anhsb
#: lib_importwiz.xhp
msgctxt ""
"lib_importwiz.xhp\n"
"par_id921593518140986\n"
"help.text"
-msgid "The <emph>ImportWizard</emph> library is used by the <emph>Document converter...</emph> wizard."
+msgid "The <emph>ImportWizard</emph> library is used by the <emph>Document Converter</emph> wizard."
msgstr ""
#. FaGZt
@@ -376,13 +502,13 @@ msgctxt ""
msgid "Its entry point is:"
msgstr ""
-#. EyBsL
+#. foGsC
#: lib_importwiz.xhp
msgctxt ""
"lib_importwiz.xhp\n"
"par_id381593519742529\n"
"help.text"
-msgid "Selecting the <emph>Document Converter...</emph> wizard loads the following libraries in memory:"
+msgid "Selecting the <emph>Document Converter</emph> wizard loads the following libraries in memory:"
msgstr ""
#. vV4TD
@@ -2230,13 +2356,13 @@ msgctxt ""
msgid "Definitions"
msgstr ""
-#. nXWRV
+#. 4gE5A
#: sf_calc.xhp
msgctxt ""
"sf_calc.xhp\n"
"par_id511591016999246\n"
"help.text"
-msgid "Many methods require a \"<emph>Sheet</emph>\" or a \"<emph>Range</emph>\" as argument. Single cells are considered a special case of a <literal>Range</literal>)."
+msgid "Many methods require a \"<emph>Sheet</emph>\" or a \"<emph>Range</emph>\" as argument. Single cells are considered a special case of a <literal>Range</literal>."
msgstr ""
#. kq2Br
@@ -2275,15 +2401,6 @@ msgctxt ""
msgid "The example below copies data from document A (opened as read-only and hidden) to document B."
msgstr ""
-#. 22mej
-#: sf_calc.xhp
-msgctxt ""
-"sf_calc.xhp\n"
-"hd_id941591020321580\n"
-"help.text"
-msgid "SheetName"
-msgstr ""
-
#. iED65
#: sf_calc.xhp
msgctxt ""
@@ -2302,15 +2419,6 @@ msgctxt ""
msgid "The shortcut \"~\" (tilde) represents the current sheet."
msgstr ""
-#. pL4FD
-#: sf_calc.xhp
-msgctxt ""
-"sf_calc.xhp\n"
-"hd_id101591020737697\n"
-"help.text"
-msgid "RangeName"
-msgstr ""
-
#. nskFb
#: sf_calc.xhp
msgctxt ""
@@ -4282,6 +4390,636 @@ msgctxt ""
msgid "'Sort range based on columns A (ascending) and C (descending)"
msgstr ""
+#. zNFY6
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"tit\n"
+"help.text"
+msgid "SFDatabases.Database service"
+msgstr ""
+
+#. K7nuj
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"hd_id371587913266310\n"
+"help.text"
+msgid "<variable id=\"DatabaseService\"><link href=\"text/sbasic/shared/03/sf_database.xhp\" name=\"Database service\"><literal>SFDatabases</literal>.<literal>Database</literal> service</link></variable>"
+msgstr ""
+
+#. RByov
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id891599407198144\n"
+"help.text"
+msgid "The <literal>Database</literal> service provides access to databases either embedded or described in Base documents. This service provides methods to:"
+msgstr ""
+
+#. 7dqXS
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id551615386924481\n"
+"help.text"
+msgid "Get access to data in database tables."
+msgstr ""
+
+#. 29pT5
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id551615386924285\n"
+"help.text"
+msgid "Run <literal>SELECT</literal> queries and perform aggregate functions."
+msgstr ""
+
+#. LYsPD
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id551615386924111\n"
+"help.text"
+msgid "Run SQL action statements such as <literal>INSERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</literal>, etc."
+msgstr ""
+
+#. ABgYk
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id811599407236602\n"
+"help.text"
+msgid "Each instance of the <literal>Database</literal> service represents a single database and gives access to its tables, queries and data. This service does not provide access to forms or reports in the Base document."
+msgstr ""
+
+#. Snu6R
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id231615386789950\n"
+"help.text"
+msgid "All exchanges between this service and the database are done using SQL only."
+msgstr ""
+
+#. MiGUE
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id121599407322804\n"
+"help.text"
+msgid "SQL statements may be run in <emph>direct</emph> or <emph>indirect</emph> mode. In direct mode the statement is transferred to the database engine without any syntax checking or review."
+msgstr ""
+
+#. Kg5Cn
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id681599407189019\n"
+"help.text"
+msgid "The provided interfaces include simple tables and queries lists, as well as access to database data."
+msgstr ""
+
+#. N3J98
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id891599407280007\n"
+"help.text"
+msgid "To make SQL statements more readable, you can use optional square brackets to enclose tables, queries and fields instead of using other enclosing characters that may be exclusive to certain Relational Database Management Systems (RDBMS)."
+msgstr ""
+
+#. CAFnK
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"hd_id91587913266988\n"
+"help.text"
+msgid "Service invocation"
+msgstr ""
+
+#. GBCxf
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id541599408159668\n"
+"help.text"
+msgid "The code snippet below shows how to access any database with the <literal>Database</literal> service."
+msgstr ""
+
+#. RApNW
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"bas_id471599408248873\n"
+"help.text"
+msgid "' ... Run queries, SQL statements, ..."
+msgstr ""
+
+#. f2tV4
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id111615146818256\n"
+"help.text"
+msgid "<emph>FileName</emph>: The name of the Base file. Must be expressed using <literal>SF_FileSystem.FileNaming</literal> notation."
+msgstr ""
+
+#. yg5bv
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id771615146944307\n"
+"help.text"
+msgid "<emph>RegistrationName</emph>: The name of a registered database. If a file name is provided, this argument should not be used."
+msgstr ""
+
+#. RM9c6
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id491615147048748\n"
+"help.text"
+msgid "Conversely, if a <literal>RegistrationName</literal> is specified, the <literal>FileName</literal> parameter should not be defined."
+msgstr ""
+
+#. 3d6NY
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id841615147168279\n"
+"help.text"
+msgid "<emph>ReadOnly</emph>: Determines if the database will be opened as readonly (Default = True)."
+msgstr ""
+
+#. Gn7AF
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id291615147236001\n"
+"help.text"
+msgid "<emph>User, Password</emph>: Additional connection parameters to the database server."
+msgstr ""
+
+#. Z2VVg
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"hd_id771615147491563\n"
+"help.text"
+msgid "Accessing Databases with the UI Service"
+msgstr ""
+
+#. 6s3Hr
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id901599408410712\n"
+"help.text"
+msgid "It is also possible to access the database associated with a Base document using the <link href=\"text/sbasic/shared/03/sf_ui.xhp\" name=\"UI Service\"><literal>ScriptForge.UI</literal></link> service, as shown in the example below:"
+msgstr ""
+
+#. T6mkQ
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"bas_id631615147843278\n"
+"help.text"
+msgid "' User and password are supplied below, if needed"
+msgstr ""
+
+#. 88wGG
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"bas_id921599408791887\n"
+"help.text"
+msgid "' ... Run queries, SQL statements, ..."
+msgstr ""
+
+#. EF9Lc
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"hd_id841587913266618\n"
+"help.text"
+msgid "Properties"
+msgstr ""
+
+#. x4Z5A
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id521587913266568\n"
+"help.text"
+msgid "Name"
+msgstr ""
+
+#. QUrYT
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id421587913266368\n"
+"help.text"
+msgid "Readonly"
+msgstr ""
+
+#. 3kQCm
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id631587914939732\n"
+"help.text"
+msgid "Type"
+msgstr ""
+
+#. RYuuo
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id951587913266220\n"
+"help.text"
+msgid "Description"
+msgstr ""
+
+#. BzLQb
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id651587913266754\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. up8WT
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id421587914989890\n"
+"help.text"
+msgid "Array of strings"
+msgstr ""
+
+#. dGoYp
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id351587913266349\n"
+"help.text"
+msgid "The list of stored queries."
+msgstr ""
+
+#. bfdLR
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id931599409717463\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. 2DDTs
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id71599409717945\n"
+"help.text"
+msgid "Array of strings"
+msgstr ""
+
+#. rGTvw
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id341599409717612\n"
+"help.text"
+msgid "The list of stored tables."
+msgstr ""
+
+#. u5YE4
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id741599409777967\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. evuSw
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id551599409777759\n"
+"help.text"
+msgid "The UNO object representing the current database connection."
+msgstr ""
+
+#. w9YZG
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id271599409887585\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. NeTGg
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id861599409887284\n"
+"help.text"
+msgid "The UNO object representing the metadata describing the database system attributes."
+msgstr ""
+
+#. ApsdK
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id231614360519973\n"
+"help.text"
+msgid "List of Methods in the Database Service"
+msgstr ""
+
+#. emrA2
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id201587913266596\n"
+"help.text"
+msgid "Closes the current database connection."
+msgstr ""
+
+#. nwbSh
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id13159655484952\n"
+"help.text"
+msgid "Computes the given aggregate function on a field or expression belonging to a table."
+msgstr ""
+
+#. E9LsG
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id101615148468548\n"
+"help.text"
+msgid "Optionally, a SQL <literal>WHERE</literal> clause can be specified as a filter that will be applied prior to the aggregate function."
+msgstr ""
+
+#. rKxVP
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id441596554849949\n"
+"help.text"
+msgid "<emph>Expression</emph>: A SQL expression in which the field names are surrounded with square brackets."
+msgstr ""
+
+#. 3PSmS
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id381596554849698\n"
+"help.text"
+msgid "<emph>TableName</emph>: A table name (without square brackets)."
+msgstr ""
+
+#. F4AAZ
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id521596554849185\n"
+"help.text"
+msgid "<emph>Criteria</emph>: A <literal>WHERE</literal> clause without the \"WHERE\" keyword, in which field names are surrounded with square brackets."
+msgstr ""
+
+#. AGBFS
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id781615150306678\n"
+"help.text"
+msgid "The example below assumes the file <literal>Employees.odb</literal> has a table named <literal>EmployeeData</literal>."
+msgstr ""
+
+#. KAqZB
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"bas_id871615150277916\n"
+"help.text"
+msgid "' Counts the number of employees in the table"
+msgstr ""
+
+#. AVstM
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"bas_id291615150373387\n"
+"help.text"
+msgid "' Returns the sum of all salaries in the table"
+msgstr ""
+
+#. cMiVJ
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"bas_id931615150423062\n"
+"help.text"
+msgid "' Below are some examples of how tables can be filtered"
+msgstr ""
+
+#. kCmmv
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id41599488113961\n"
+"help.text"
+msgid "Computes a SQL expression on a single record returned by a <literal>WHERE</literal> clause defined by the <literal>Criteria</literal> parameter."
+msgstr ""
+
+#. 8yUaz
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id601615381471954\n"
+"help.text"
+msgid "If the query returns multiple records, only the first one is considered. Use the <literal>OrderClause</literal> parameter to determine how query results are sorted."
+msgstr ""
+
+#. CNwh2
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id671599488113986\n"
+"help.text"
+msgid "<emph>Expression</emph>: A SQL expression in which the field names are surrounded with square brackets."
+msgstr ""
+
+#. 5DGVh
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id441599488113247\n"
+"help.text"
+msgid "<emph>TableName</emph>: A table name (without square brackets)."
+msgstr ""
+
+#. jtrX7
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id40159948811316\n"
+"help.text"
+msgid "<emph>Criteria</emph>: A <literal>WHERE</literal> clause without the \"WHERE\" keyword, in which field names are surrounded with square brackets."
+msgstr ""
+
+#. X5HJp
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id71599488689029\n"
+"help.text"
+msgid "<emph>OrderClause</emph>: An <literal>ORDER BY</literal> clause without the \"ORDER BY\" keywords. Field names should be surrounded with square brackets."
+msgstr ""
+
+#. CPoBx
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id481599489278579\n"
+"help.text"
+msgid "Stores the contents of a table or the results of a <literal>SELECT</literal> query or of an SQL statement in a two-dimensional array. The first index in the array corresponds to the rows and the second index refers to the columns."
+msgstr ""
+
+#. GXji8
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id821615384762425\n"
+"help.text"
+msgid "An upper limit can be specified to the number of returned rows. Optionally column names may be inserted in the first row of the array."
+msgstr ""
+
+#. gX7AY
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id271599490209915\n"
+"help.text"
+msgid "The returned array will be empty if no rows are returned and the column headers are not required."
+msgstr ""
+
+#. dURZU
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id451599489278429\n"
+"help.text"
+msgid "<emph>SQLCommand</emph>: A table or query name (without square brackets) or a <literal>SELECT</literal> SQL statement."
+msgstr ""
+
+#. fFFFd
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id271599489278141\n"
+"help.text"
+msgid "<emph>DirectSQL</emph>: When <literal>True</literal>, the SQL command is sent to the database engine without pre-analysis. Default is <literal>False</literal>. This argument is ignored for tables. For queries, the applied option is the one set when the query was defined."
+msgstr ""
+
+#. unoDn
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id941599489278747\n"
+"help.text"
+msgid "<emph>Header</emph>: When <literal>True</literal>, the first row of the returned array contains the column headers."
+msgstr ""
+
+#. BZxwK
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id591599489278926\n"
+"help.text"
+msgid "<emph>MaxRows</emph>: The maximum number of rows to return. The default is zero, meaning there is no limit to the number of returned rows."
+msgstr ""
+
+#. 3XZPf
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id721615385125947\n"
+"help.text"
+msgid "Below are a few examples of how the <literal>GetRows</literal> method can be used:"
+msgstr ""
+
+#. zkeuW
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"bas_id171615385196045\n"
+"help.text"
+msgid "' Returns all rows in the table with column headers"
+msgstr ""
+
+#. eFmmE
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"bas_id371615385230721\n"
+"help.text"
+msgid "' Returns the first 50 employee records ordered by the 'FirstName' field"
+msgstr ""
+
+#. FMBEy
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id31599490609759\n"
+"help.text"
+msgid "Executes an action query of an SQL statement such as creating a table, as well as inserting, updating and deleting records."
+msgstr ""
+
+#. gyiQy
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id331615385491925\n"
+"help.text"
+msgid "The method returns <literal>True</literal> when successful."
+msgstr ""
+
+#. G5bDE
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id21599490810021\n"
+"help.text"
+msgid "The <literal>RunSql</literal> method is rejected with an error message in case the database was previously opened in read-only mode."
+msgstr ""
+
+#. cMjus
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id701599490609473\n"
+"help.text"
+msgid "<emph>SQLCommand</emph>: A query name (without square brackets) or a SQL statement."
+msgstr ""
+
+#. kngXb
+#: sf_database.xhp
+msgctxt ""
+"sf_database.xhp\n"
+"par_id51599490609377\n"
+"help.text"
+msgid "<emph>DirectSQL</emph>: When <literal>True</literal>, the SQL command is sent to the database engine without pre-analysis. (Default = <literal>False</literal>). For queries, the applied option is the one set when the query was defined."
+msgstr ""
+
#. BC4Sc
#: sf_dialog.xhp
msgctxt ""
@@ -4363,13 +5101,13 @@ msgctxt ""
msgid "Service invocation and usage"
msgstr ""
-#. hZcuK
+#. v8RcL
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
"par_id361598174756160\n"
"help.text"
-msgid "The dialog service is invoked through the <literal>CreateScriptService</literal> method. It requires three arguments to specify the dialog box to activate:"
+msgid "The <literal>Dialog</literal> service is invoked through the <literal>CreateScriptService</literal> method. It requires three arguments to specify the dialog box to activate:"
msgstr ""
#. Ntzqh
@@ -4444,6 +5182,15 @@ msgctxt ""
msgid "Note that in previous examples, the prefix <literal>\"SFDialogs.\"</literal> may be omitted."
msgstr ""
+#. zLWvF
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id251612628336779\n"
+"help.text"
+msgid "Properties or methods marked below as <emph>(7.2)</emph> are available as from %PRODUCTNAME 7.2 onwards."
+msgstr ""
+
#. nXGkZ
#: sf_dialog.xhp
msgctxt ""
@@ -4669,121 +5416,301 @@ msgctxt ""
msgid "The UNO object representing the dialog view. Refer to <link href=\"https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1awt_1_1XControlModel.html\" name=\"XControl interface\">XControl</link> and <link href=\"https://api.libreoffice.org/docs/idl/ref/servicecom_1_1sun_1_1star_1_1awt_1_1UnoControlDialog-members.html\" name=\"UnoControlDialog interface\">UnoControlDialog</link> in Application Programming Interface (API) documentation for detailed information."
msgstr ""
-#. gTQjc
+#. q8eyc
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
-"par_id921606472825856\n"
+"hd_id421612628828054\n"
"help.text"
-msgid "Methods"
+msgid "Event properties"
msgstr ""
-#. DiCyL
+#. EbGWN
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
-"par_id871583933076448\n"
+"par_id41612629140856\n"
"help.text"
-msgid "Set the focus on the current <literal>Dialog</literal> instance. Return <literal>True</literal> if focusing was successful."
+msgid "Returns a URI string with the reference to the script triggered by the event. Read its specification in the <link href=\"https://wiki.openoffice.org/wiki/Documentation/DevGuide/Scripting/Scripting_Framework_URI_Specification\" name=\"URI specification\">scripting framework URI specification</link>."
msgstr ""
-#. 7QdPA
+#. XCC7C
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
-"par_id151598178880227\n"
+"par_id961612628879819\n"
"help.text"
-msgid "This method is called from a dialog or control event, or when a dialog is displayed in non-modal mode."
+msgid "Name"
msgstr ""
-#. L9qDh
+#. V3bin
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
-"hd _id61583933076171\n"
+"par_id401612628879819\n"
"help.text"
-msgid "<embedvar href=\"text/sbasic/shared/00000003.xhp#functsyntax\"/>"
+msgid "ReadOnly"
msgstr ""
-#. iFcFd
+#. uW85z
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
-"hd _id26158393307687\n"
+"par_id281612628879819\n"
"help.text"
-msgid "<embedvar href=\"text/sbasic/shared/00000003.xhp#functexample\"/>"
+msgid "Basic IDE Description"
msgstr ""
-#. eYDfG
+#. dFkbN
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
-"bas_id841598179117184\n"
+"par_id111612629836630\n"
"help.text"
-msgid "' Dialog stored in current document's standard library"
+msgid "Yes"
msgstr ""
-#. 4qLn9
+#. aKBvg
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
-"par_id161584541257982\n"
+"par_id1001612629836902\n"
"help.text"
-msgid "Return either:"
+msgid "When receiving focus"
msgstr ""
-#. isSnB
+#. 4FBaJ
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
-"par_id421598179770993\n"
+"par_id291612629836294\n"
"help.text"
-msgid "the list of the controls contained in the dialog"
+msgid "Yes"
msgstr ""
-#. 4EuYK
+#. 8U7FZ
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
-"par_id81598185229301\n"
+"par_id62161262983683\n"
"help.text"
-msgid "a dialog control class instance based on its name"
+msgid "When losing focus"
msgstr ""
-#. 2RFtC
+#. wBCKi
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
-"hd _id601584541257443\n"
+"par_id81612629836634\n"
"help.text"
-msgid "<embedvar href=\"text/sbasic/shared/00000003.xhp#functsyntax\"/>"
+msgid "Yes"
msgstr ""
-#. 7PGuV
+#. CK5vU
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
-"hd _id291584541257237\n"
+"par_id881612629836744\n"
"help.text"
-msgid "<embedvar href=\"text/sbasic/shared/00000003.xhp#functparameters\"/>"
+msgid "Key pressed"
msgstr ""
-#. AEAHd
+#. gXJGu
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
-"par_id1001584541257789\n"
+"par_id591612629836830\n"
"help.text"
-msgid "<emph>ControlName</emph> : A valid control name as a case-sensitive string. If absent, the list of control names is returned as a zero-based array."
+msgid "Yes"
msgstr ""
-#. atHXa
+#. CJwi7
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
-"hd _id32158454125769\n"
+"par_id161612629836775\n"
"help.text"
-msgid "<embedvar href=\"text/sbasic/shared/00000003.xhp#functexample\"/>"
+msgid "Key released"
+msgstr ""
+
+#. wS7GH
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id891612629836630\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. GcDU7
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id461612629836679\n"
+"help.text"
+msgid "Mouse moved while key presses"
+msgstr ""
+
+#. eUS49
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id131612629836291\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. QrByH
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id151612629836151\n"
+"help.text"
+msgid "Mouse inside"
+msgstr ""
+
+#. CRGTF
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id211612629836725\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. 69s4B
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id361612629836624\n"
+"help.text"
+msgid "Mouse outside"
+msgstr ""
+
+#. ojLRr
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id311612629836481\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. XaS8A
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id721612629836752\n"
+"help.text"
+msgid "Mouse moved"
+msgstr ""
+
+#. MnMUF
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id981612629836116\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. NtqPz
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id381612629836635\n"
+"help.text"
+msgid "Mouse button pressed"
+msgstr ""
+
+#. czknv
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id711612629836704\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. J2uzg
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id35161262983642\n"
+"help.text"
+msgid "Mouse button released"
+msgstr ""
+
+#. gTQjc
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id921606472825856\n"
+"help.text"
+msgid "Methods"
+msgstr ""
+
+#. DiCyL
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id871583933076448\n"
+"help.text"
+msgid "Set the focus on the current <literal>Dialog</literal> instance. Return <literal>True</literal> if focusing was successful."
+msgstr ""
+
+#. 7QdPA
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id151598178880227\n"
+"help.text"
+msgid "This method is called from a dialog or control event, or when a dialog is displayed in non-modal mode."
+msgstr ""
+
+#. eYDfG
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"bas_id841598179117184\n"
+"help.text"
+msgid "' Dialog stored in current document's standard library"
+msgstr ""
+
+#. 4qLn9
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id161584541257982\n"
+"help.text"
+msgid "Return either:"
+msgstr ""
+
+#. isSnB
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id421598179770993\n"
+"help.text"
+msgid "the list of the controls contained in the dialog"
+msgstr ""
+
+#. 4EuYK
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id81598185229301\n"
+"help.text"
+msgid "a dialog control class instance based on its name"
+msgstr ""
+
+#. AEAHd
+#: sf_dialog.xhp
+msgctxt ""
+"sf_dialog.xhp\n"
+"par_id1001584541257789\n"
+"help.text"
+msgid "<emph>ControlName</emph> : A valid control name as a case-sensitive string. If absent, the list of control names is returned as a zero-based array."
msgstr ""
#. j8x9C
@@ -4876,22 +5803,13 @@ msgctxt ""
msgid "' Dialog stored in current document's standard library"
msgstr ""
-#. FrCG7
-#: sf_dialog.xhp
-msgctxt ""
-"sf_dialog.xhp\n"
-"bas_id781612273203518\n"
-"help.text"
-msgid "End Select"
-msgstr ""
-
-#. DYy75
+#. ARCGg
#: sf_dialog.xhp
msgctxt ""
"sf_dialog.xhp\n"
"par_id21598187953679\n"
"help.text"
-msgid "Terminate the dialog service for the current instance. Return <literal>True</literal> if the termination was successful."
+msgid "Terminate the <literal>Dialog</literal> service for the current instance. Return <literal>True</literal> if the termination was successful."
msgstr ""
#. BFfGX
@@ -4921,31 +5839,31 @@ msgctxt ""
msgid "The <literal>DialogControl</literal> service manages the controls belonging to a dialog defined with the Basic <link href=\"text/sbasic/guide/create_dialog.xhp\" name=\"Dialog Editor\">Dialog Editor</link>. Each instance of the current service represents a single control within a dialog box."
msgstr ""
-#. 3oXnC
+#. 7dDgL
#: sf_dialogcontrol.xhp
msgctxt ""
"sf_dialogcontrol.xhp\n"
-"bm_id331612167249331\n"
+"par_id701598191157426\n"
"help.text"
-msgid "<bookmark_value>API;awt.XControl</bookmark_value> <bookmark_value>API;awt.XControlModel</bookmark_value>"
+msgid "The focus is set on getting and setting the values displayed by the controls of the dialog box. Formatting is accessible via the <literal>XControlModel</literal> and <literal>XControlView</literal> properties."
msgstr ""
-#. 7dDgL
+#. fFfwe
#: sf_dialogcontrol.xhp
msgctxt ""
"sf_dialogcontrol.xhp\n"
-"par_id701598191157426\n"
+"par_id981598191184526\n"
"help.text"
-msgid "The focus is set on getting and setting the values displayed by the controls of the dialog box. Formatting is accessible via the <literal>XControlModel</literal> and <literal>XControlView</literal> properties."
+msgid "Note that the unique <literal>DialogControl.Value</literal> property content varies according to the control type."
msgstr ""
-#. GqHgy
+#. MBrzA
#: sf_dialogcontrol.xhp
msgctxt ""
"sf_dialogcontrol.xhp\n"
-"par_id981598191184526\n"
+"par_id991612698027551\n"
"help.text"
-msgid "Note that <literal>DialogControl.Value</literal> property content varies according to UNO control types."
+msgid "A special attention is given to controls of type tree control. It is easy to populate a tree, either branch by branch, or with a set of branches at once. Populating a tree control can be performed statically or dynamically."
msgstr ""
#. 9LpGF
@@ -5029,6 +5947,15 @@ msgctxt ""
msgid "The <literal>DialogControl</literal> service is available for these control types:"
msgstr ""
+#. ScLTk
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id171612698897514\n"
+"help.text"
+msgid "TreeControl"
+msgstr ""
+
#. 7xddb
#: sf_dialogcontrol.xhp
msgctxt ""
@@ -5092,6 +6019,15 @@ msgctxt ""
msgid "No"
msgstr ""
+#. jqpFz
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id231598538847029\n"
+"help.text"
+msgid "Button"
+msgstr ""
+
#. aTyMC
#: sf_dialogcontrol.xhp
msgctxt ""
@@ -5146,6 +6082,33 @@ msgctxt ""
msgid "One of the types listed above."
msgstr ""
+#. oMipU
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id67161270548283\n"
+"help.text"
+msgid "No"
+msgstr ""
+
+#. 59ovD
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id341612705482566\n"
+"help.text"
+msgid "UNO<br/>object"
+msgstr ""
+
+#. w2ZhT
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id1001612705482919\n"
+"help.text"
+msgid "The currently upmost node selected in the tree control. Refer to <link href=\"https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1awt_1_1tree_1_1XMutableTreeNode.html\" name=\"awt.tree.XMutableTreeNode\">XmutableTreeNode</link> in Application Programming Interface (API) documentation for detailed information."
+msgstr ""
+
#. veivJ
#: sf_dialogcontrol.xhp
msgctxt ""
@@ -5200,13 +6163,13 @@ msgctxt ""
msgid "No"
msgstr ""
-#. DrmM6
+#. 6L9ke
#: sf_dialogcontrol.xhp
msgctxt ""
"sf_dialogcontrol.xhp\n"
-"par_id491598539231618\n"
+"par_id491598529331618\n"
"help.text"
-msgid "DateField, TimeField, FormattedField (read-only)"
+msgid "(read-only)"
msgstr ""
#. QbN5U
@@ -5425,6 +6388,33 @@ msgctxt ""
msgid "Specifies the file name containing a bitmap or other type of graphic to be displayed on the specified control. The filename must comply with the <literal>FileNaming</literal> attribute of the <literal>ScriptForge.FileSystem</literal> service."
msgstr ""
+#. LZLsc
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id831612700624650\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. QxAW9
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id711612700624483\n"
+"help.text"
+msgid "UNO<br/>object"
+msgstr ""
+
+#. m4N4j
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id11612700624514\n"
+"help.text"
+msgid "An object representing the lowest root node (usually there is only one such root node). Refer to <link href=\"https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1awt_1_1tree_1_1XMutableTreeNode.html\" name=\"awt.tree.XMutableTreeNode\">XmutableTreeNode</link> in Application Programming Interface (API) documentation for detailed information."
+msgstr ""
+
#. PqsSY
#: sf_dialogcontrol.xhp
msgctxt ""
@@ -5515,13 +6505,13 @@ msgctxt ""
msgid "No"
msgstr ""
-#. fk87j
+#. ZHrsm
#: sf_dialogcontrol.xhp
msgctxt ""
"sf_dialogcontrol.xhp\n"
-"par_id991598517671916\n"
+"par_id1001598540024225\n"
"help.text"
-msgid "Read below."
+msgid "Refer to <link href=\"text/sbasic/shared/03/sf_dialogcontrol.xhp#hd_id81598540704978\" name=\"Value property\">Value property</link>"
msgstr ""
#. PqKgo
@@ -5623,13 +6613,49 @@ msgctxt ""
msgid "The UNO object representing the control view. Refer to <link href=\"https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1awt_1_1XControl.html\" name=\"awt.XControl\">XControl</link> and <link href=\"https://api.libreoffice.org/docs/idl/ref/servicecom_1_1sun_1_1star_1_1awt_1_1UnoControlDialog.html)\" name=\"awt.UnoControlDialog\">UnoControlDialog</link> in Application Programming Interface (API) documentation for detailed information."
msgstr ""
-#. agJv5
+#. SAkJX
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id741612699446459\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. yuAdF
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id311612699446893\n"
+"help.text"
+msgid "UNO<br/>object"
+msgstr ""
+
+#. 3Dmwo
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id25161269944611\n"
+"help.text"
+msgid "TreeControl"
+msgstr ""
+
+#. 7XckG
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id691612699446892\n"
+"help.text"
+msgid "The UNO object representing the tree control data model. Refer to <link href=\"https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1awt_1_1tree_1_1XMutableTreeDataModel.html\" name=\"awt.tree.XMutableTreeDataModel\">XMutableTreeDataModel</link> in Application Programming Interface (API) documentation for detailed information."
+msgstr ""
+
+#. dfWTW
#: sf_dialogcontrol.xhp
msgctxt ""
"sf_dialogcontrol.xhp\n"
"hd_id81598540704978\n"
"help.text"
-msgid "The Value property"
+msgid "The <variable id=\"ValueProperty\">Value property</variable>"
msgstr ""
#. JHK7w
@@ -5659,6 +6685,15 @@ msgctxt ""
msgid "Description"
msgstr ""
+#. kfK2B
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id271598543254590\n"
+"help.text"
+msgid "Boolean"
+msgstr ""
+
#. jEyx9
#: sf_dialogcontrol.xhp
msgctxt ""
@@ -5686,6 +6721,15 @@ msgctxt ""
msgid "0, False: not checked<br/>1, True: checked<br/>2: grayed, don't know"
msgstr ""
+#. EKHtH
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id781598543254887\n"
+"help.text"
+msgid "String"
+msgstr ""
+
#. nZVA5
#: sf_dialogcontrol.xhp
msgctxt ""
@@ -5704,6 +6748,24 @@ msgctxt ""
msgid "Numeric"
msgstr ""
+#. DoCfT
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id401598543254743\n"
+"help.text"
+msgid "Date"
+msgstr ""
+
+#. XzBhY
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id731598543254544\n"
+"help.text"
+msgid "String"
+msgstr ""
+
#. kgfXR
#: sf_dialogcontrol.xhp
msgctxt ""
@@ -5749,6 +6811,15 @@ msgctxt ""
msgid "Numeric"
msgstr ""
+#. CCkkF
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id81598543254625\n"
+"help.text"
+msgid "String"
+msgstr ""
+
#. YvPAp
#: sf_dialogcontrol.xhp
msgctxt ""
@@ -5767,6 +6838,15 @@ msgctxt ""
msgid "Must be within the predefined bounds"
msgstr ""
+#. veFie
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id561598543254115\n"
+"help.text"
+msgid "Boolean"
+msgstr ""
+
#. ZragT
#: sf_dialogcontrol.xhp
msgctxt ""
@@ -5794,6 +6874,15 @@ msgctxt ""
msgid "Must be within the predefined bounds"
msgstr ""
+#. 5VuCQ
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id751598543254299\n"
+"help.text"
+msgid "String"
+msgstr ""
+
#. a9AMF
#: sf_dialogcontrol.xhp
msgctxt ""
@@ -5803,6 +6892,348 @@ msgctxt ""
msgid "The text appearing in the field"
msgstr ""
+#. wGGjL
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id341598543254600\n"
+"help.text"
+msgid "Date"
+msgstr ""
+
+#. CABLr
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"hd_id421612628828054\n"
+"help.text"
+msgid "Event properties"
+msgstr ""
+
+#. c7srp
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id41612629140856\n"
+"help.text"
+msgid "Returns a URI string with the reference to the script triggered by the event. Read its specification in the <link href=\"https://wiki.openoffice.org/wiki/Documentation/DevGuide/Scripting/Scripting_Framework_URI_Specification\" name=\"URI specification\">scripting framework URI specification</link>."
+msgstr ""
+
+#. fkFAt
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id961612628879819\n"
+"help.text"
+msgid "Name"
+msgstr ""
+
+#. 2sB8F
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id401612628879819\n"
+"help.text"
+msgid "ReadOnly"
+msgstr ""
+
+#. 2A2Ex
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id281612628879819\n"
+"help.text"
+msgid "Description as labeled in the Basic IDE"
+msgstr ""
+
+#. rSRBQ
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id91612707166532\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. aABgD
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id291612707166258\n"
+"help.text"
+msgid "Execute action"
+msgstr ""
+
+#. KnFdW
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id79161270716675\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. JrRob
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id831612707166731\n"
+"help.text"
+msgid "While adjusting"
+msgstr ""
+
+#. mpuj3
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id111612629836630\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. 7Swj5
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id1001612629836902\n"
+"help.text"
+msgid "When receiving focus"
+msgstr ""
+
+#. Mp4i7
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id291612629836294\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. ozGia
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id62161262983683\n"
+"help.text"
+msgid "When losing focus"
+msgstr ""
+
+#. TR5uW
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id51612707354544\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. HREcr
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id211612707354899\n"
+"help.text"
+msgid "Item status changed"
+msgstr ""
+
+#. L6e2x
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id81612629836634\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. sVo6A
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id881612629836744\n"
+"help.text"
+msgid "Key pressed"
+msgstr ""
+
+#. pPBHX
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id591612629836830\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. P6NX8
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id161612629836775\n"
+"help.text"
+msgid "Key released"
+msgstr ""
+
+#. XJGHA
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id891612629836630\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. oCDXm
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id461612629836679\n"
+"help.text"
+msgid "Mouse moved while key presses"
+msgstr ""
+
+#. nLbMG
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id131612629836291\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. 9XdcG
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id151612629836151\n"
+"help.text"
+msgid "Mouse inside"
+msgstr ""
+
+#. BZ7sC
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id211612629836725\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. mzbBD
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id361612629836624\n"
+"help.text"
+msgid "Mouse outside"
+msgstr ""
+
+#. fAD8Y
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id311612629836481\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. FCBxu
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id721612629836752\n"
+"help.text"
+msgid "Mouse moved"
+msgstr ""
+
+#. 4DCtC
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id981612629836116\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. 8B9ct
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id381612629836635\n"
+"help.text"
+msgid "Mouse button pressed"
+msgstr ""
+
+#. krueU
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id711612629836704\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. 4c5qE
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id35161262983642\n"
+"help.text"
+msgid "Mouse button released"
+msgstr ""
+
+#. FkyLb
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id851612707606863\n"
+"help.text"
+msgid "No"
+msgstr ""
+
+#. VudpK
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id351612707606197\n"
+"help.text"
+msgid "(Not in Basic IDE) when the expansion button is pressed on a node in a tree control"
+msgstr ""
+
+#. TkEgQ
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id121612707606251\n"
+"help.text"
+msgid "No"
+msgstr ""
+
+#. quWBQ
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id881612707606121\n"
+"help.text"
+msgid "(Not in Basic IDE) when a node in a tree control is selected"
+msgstr ""
+
+#. qyb3B
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id811612707606330\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. th6Kr
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id621612707606219\n"
+"help.text"
+msgid "Text modified"
+msgstr ""
+
#. YFbGT
#: sf_dialogcontrol.xhp
msgctxt ""
@@ -5821,33 +7252,222 @@ msgctxt ""
msgid "List of Methods in the DialogControl Service"
msgstr ""
-#. 3oU3L
+#. 5jtfg
#: sf_dialogcontrol.xhp
msgctxt ""
"sf_dialogcontrol.xhp\n"
-"par_id871583933076448\n"
+"par_id831612711823126\n"
"help.text"
-msgid "Set the focus on the control. Return <literal>True</literal> if focusing was successful."
+msgid "Create and return a new node of the tree control as a UNO object subordinate to a parent node. <variable id=\"XMutableTreeNode\">Refer to <link href=\"https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1awt_1_1tree_1_1XMutableTreeNode.html\" name=\"awt.tree.XMutableTreeNode\">XMutableTreeNode</link> in Application Programming Interface (API) documentation for detailed information.</variable>"
msgstr ""
-#. 6YvuU
+#. MrQnS
#: sf_dialogcontrol.xhp
msgctxt ""
"sf_dialogcontrol.xhp\n"
-"par_id151598178880227\n"
+"par_id741612711823706\n"
"help.text"
-msgid "This method is often called from a dialog or control event."
+msgid "This method may be called before displaying the dialog box to build the initial tree. It may also be called from a dialog or control event - using the <literal>OnNodeExpanded</literal> event - to complete the tree dynamically."
msgstr ""
-#. B7sAb
+#. cK7HA
#: sf_dialogcontrol.xhp
msgctxt ""
"sf_dialogcontrol.xhp\n"
-"bas_id841598179117184\n"
+"par_id761612711823834\n"
+"help.text"
+msgid "<emph>ParentNode</emph>: A node UNO object, of type <literal>com.sun.star.awt.tree.XMutableTreeNode</literal>."
+msgstr ""
+
+#. g2Ubo
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id791612711823819\n"
+"help.text"
+msgid "<emph>DisplayValue</emph>: The text appearing in the tree control box."
+msgstr ""
+
+#. GV6Gp
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id911612711823382\n"
+"help.text"
+msgid "<emph>DataValue</emph>: Any value associated with the new node. Default value is <literal>Empty</literal>."
+msgstr ""
+
+#. qbb2x
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"bas_id401612711823779\n"
"help.text"
msgid "'Dialog stored in current document's standard library"
msgstr ""
+#. 8B3qP
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id221612713087885\n"
+"help.text"
+msgid "Return <literal>True</literal> when a subtree, subordinate to a parent node, could be inserted successfully in a tree control. If the parent node had already child nodes before calling this method, the child nodes are erased."
+msgstr ""
+
+#. UkE9k
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id781612713087722\n"
+"help.text"
+msgid "<emph>ParentNode</emph>: A node UNO object, of type <literal>com.sun.star.awt.tree.XMutableTreeNode</literal>."
+msgstr ""
+
+#. 2FTD4
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id36161271308759\n"
+"help.text"
+msgid "<emph>FlatTree</emph>: a two dimension array sorted on the columns containing the display values. Such an array can be issued by the <literal>GetRows</literal> method applied on the <literal>SFDatabases.Database</literal> service. When an array item containing the text to be displayed is <literal>Empty</literal> or <literal>Null</literal>, no new subnode is created and the remainder of the row is skipped."
+msgstr ""
+
+#. r5QNj
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"bas_id61612716027443\n"
+"help.text"
+msgid "Flat tree >>>> Resulting subtree"
+msgstr ""
+
+#. SQH7v
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id51612713087915\n"
+"help.text"
+msgid "<emph>WithDataValue</emph>: When <literal>False</literal> default value is used, every column of <literal>FlatTree</literal> contains the text to be displayed in the tree control. When <literal>True</literal>, the texts to be displayed (<literal>DisplayValue</literal>) are in columns 0, 2, 4, ... while the data values (<literal>DataValue</literal>) are in columns 1, 3, 5, ..."
+msgstr ""
+
+#. fWnhZ
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id151612780723320\n"
+"help.text"
+msgid "Returns a new root node of the tree control, as a node UNO object of type <literal>com.sun.star.awt.tree.XMutableTreeNode</literal>. The new tree root is inserted below pre-existing root nodes. <embedvar href=\"text/sbasic/shared/03/sf_dialogcontrol.xhp#XMutableTreeNode\"/>"
+msgstr ""
+
+#. YT845
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id821612780723965\n"
+"help.text"
+msgid "This method may be called before displaying the dialog box to build the initial tree. It may also be called from a dialog or control event to complete the tree dynamically."
+msgstr ""
+
+#. QiXVA
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id671612780723837\n"
+"help.text"
+msgid "<emph>DisplayValue</emph>: The text appearing in the tree control box."
+msgstr ""
+
+#. Cw3b9
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id31612780723267\n"
+"help.text"
+msgid "<emph>DataValue</emph>: Any value associated with the new node. Default value is <literal>Empty</literal>."
+msgstr ""
+
+#. Ynpwt
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id171612781589503\n"
+"help.text"
+msgid "Traverses the tree and finds recursively, starting from the root, a node meeting some criteria. Either - 1 match is enough - having its display value matching <literal>DisplayValue</literal> pattern or having its data value equal to <literal>DataValue</literal>. The comparisons may be or not case-sensitive. The first matching occurrence is returned as a node UNO object of type <literal>com.sun.star.awt.tree.XMutableTreeNode</literal>. <embedvar href=\"text/sbasic/shared/03/sf_dialogcontrol.xhp#XMutableTreeNode\"/>"
+msgstr ""
+
+#. 5Jxkj
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id741612782475457\n"
+"help.text"
+msgid "When not found, the method returns <literal>Nothing</literal>, to be tested with the <literal>IsNull()</literal> builtin function."
+msgstr ""
+
+#. n7pE8
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id41612781589363\n"
+"help.text"
+msgid "This method may be called before displaying the dialog box to build the initial tree. It may also be called from a dialog or control event."
+msgstr ""
+
+#. t5Kcc
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id541613670199211\n"
+"help.text"
+msgid "One argument out of <literal>DisplayValue</literal>or <literal>DataValue</literal> must be specified. If both present, one match is sufficient to select the node."
+msgstr ""
+
+#. KMPVF
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id591612781589560\n"
+"help.text"
+msgid "<emph>DisplayValue</emph>: The pattern to be matched. See the <link href=\"text/sbasic/shared/03/sf_string.xhp#IsLike\" name=\"Sting service IsLike() method\"><literal>SF_String.IsLike()</literal></link> method. When equal to the zero-length string (default), this display value is not searched for."
+msgstr ""
+
+#. CF4o6
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id481612781589626\n"
+"help.text"
+msgid "<emph>DataValue</emph>: A string, a numeric value, a date. Use <literal>Empty</literal> default value when no value applies."
+msgstr ""
+
+#. g7uEG
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id141582384726168\n"
+"help.text"
+msgid "<emph>CaseSensitive</emph>: Default value is <literal>False</literal>"
+msgstr ""
+
+#. 3oU3L
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id871583933076448\n"
+"help.text"
+msgid "Set the focus on the control. Return <literal>True</literal> if focusing was successful."
+msgstr ""
+
+#. 6YvuU
+#: sf_dialogcontrol.xhp
+msgctxt ""
+"sf_dialogcontrol.xhp\n"
+"par_id151598178880227\n"
+"help.text"
+msgid "This method is often called from a dialog or control event."
+msgstr ""
+
#. HNmmm
#: sf_dialogcontrol.xhp
msgctxt ""
@@ -5866,13 +7486,13 @@ msgctxt ""
msgid "An error is raised if the actual control is not of the type <literal>TextField</literal> or is not multiline."
msgstr ""
-#. MwNhE
+#. AKiEA
#: sf_dialogcontrol.xhp
msgctxt ""
"sf_dialogcontrol.xhp\n"
"par_id1001584541257789\n"
"help.text"
-msgid "<emph>Line</emph> : The string to insert. Default = an empty line."
+msgid "<emph>Line</emph>: The string to insert. Default is an empty line."
msgstr ""
#. opNus
@@ -8017,15 +9637,6 @@ msgctxt ""
msgid "The following code snippet invokes the <literal>FileSystem</literal> service. The method <literal>BuildPath</literal> was used as an example."
msgstr ""
-#. hUmn8
-#: sf_filesystem.xhp
-msgctxt ""
-"sf_filesystem.xhp\n"
-"bm_id901612991354326\n"
-"help.text"
-msgid "<bookmark_value>FileSystem service;FileNaming property</bookmark_value> <bookmark_value>FileSystem service;ConfigFolder property</bookmark_value> <bookmark_value>FileSystem service;ExtensionsFolder property</bookmark_value> <bookmark_value>FileSystem service;HomeFolder property</bookmark_value> <bookmark_value>FileSystem service;InstallFolder property</bookmark_value> <bookmark_value>FileSystem service;TemplatesFolder property</bookmark_value> <bookmark_value>FileSystem service;TemporaryFolder property</bookmark_value> <bookmark_value>FileSystem service;UserTemplatesFolder property</bookmark_value>"
-msgstr ""
-
#. Gsznv
#: sf_filesystem.xhp
msgctxt ""
@@ -8269,22 +9880,22 @@ msgctxt ""
msgid "Joins a folder path and the name of a file and returns the full file name with a valid path separator. The path separator is added only if necessary."
msgstr ""
-#. dbCP6
+#. EDmLL
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id90158393307695\n"
"help.text"
-msgid "<emph>FolderName</emph> : The path with which <literal>Name</literal> will be combined. The specified path does not need to be an existing folder."
+msgid "<emph>FolderName</emph>: The path with which <literal>Name</literal> will be combined. The specified path does not need to be an existing folder."
msgstr ""
-#. LaGBv
+#. TqBVA
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id891583933076975\n"
"help.text"
-msgid "<emph>Name</emph> : The name of the file to be appended to <literal>FolderName</literal>. This parameter uses the notation of the current operating system."
+msgid "<emph>Name</emph>: The name of the file to be appended to <literal>FolderName</literal>. This parameter uses the notation of the current operating system."
msgstr ""
#. DwTpc
@@ -8305,22 +9916,22 @@ msgctxt ""
msgid "Depending on the value of the <literal>CompareContents</literal> argument, the comparison between both files can be either based only on file attributes (such as the last modified date), or based on the file contents."
msgstr ""
-#. dLpG4
+#. kYy2f
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id481601118910755\n"
"help.text"
-msgid "<emph>FileName1, FileName2</emph> : The files to compare."
+msgid "<emph>FileName1, FileName2</emph>: The files to compare."
msgstr ""
-#. TAPBR
+#. mXZPN
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id111601118910848\n"
"help.text"
-msgid "<emph>CompareContents</emph> : When <literal>True</literal>, the contents of the files are compared (default = <literal>False</literal>)."
+msgid "<emph>CompareContents</emph>: When <literal>True</literal>, the contents of the files are compared (default = <literal>False</literal>)."
msgstr ""
#. EZNG5
@@ -8350,22 +9961,22 @@ msgctxt ""
msgid "The method stops immediately after it encounters an error. The method does not roll back nor does it undo changes made before the error occurred."
msgstr ""
-#. ErB6x
+#. cxNda
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id1001584541257789\n"
"help.text"
-msgid "<emph>Source</emph> : It can be a <literal>FileName</literal> or a <literal>NamePattern</literal> indicating one or more files to be copied."
+msgid "<emph>Source</emph>: It can be a <literal>FileName</literal> or a <literal>NamePattern</literal> indicating one or more files to be copied."
msgstr ""
-#. A3qtd
+#. pwEq9
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id111584542310166\n"
"help.text"
-msgid "<emph>Destination</emph> : It can be either a <literal>FileName</literal> specifying where the single <literal>Source</literal> file is to be copied, or a <literal>FolderName</literal> into which the multiple files from <literal>Source</literal> are to be copied."
+msgid "<emph>Destination</emph>: It can be either a <literal>FileName</literal> specifying where the single <literal>Source</literal> file is to be copied, or a <literal>FolderName</literal> into which the multiple files from <literal>Source</literal> are to be copied."
msgstr ""
#. FCpqn
@@ -8386,13 +9997,13 @@ msgctxt ""
msgid "Wildcard characters are not allowed in <literal>Destination</literal>."
msgstr ""
-#. 53E5r
+#. 48FYf
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id251584542431558\n"
"help.text"
-msgid "<emph>Overwrite</emph> : If <literal>True</literal> (default), files may be overwritten. The method will fail if <literal>Destination</literal> is readonly, regardless of the value specified in <literal>Overwrite</literal>."
+msgid "<emph>Overwrite</emph>: If <literal>True</literal> (default), files may be overwritten. The method will fail if <literal>Destination</literal> is readonly, regardless of the value specified in <literal>Overwrite</literal>."
msgstr ""
#. KerV3
@@ -8440,22 +10051,22 @@ msgctxt ""
msgid "The method stops immediately after it encounters an error. The method does not roll back nor does it undo changes made before the error occurred."
msgstr ""
-#. ygWn7
+#. isESD
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id851584544734202\n"
"help.text"
-msgid "<emph>Source</emph> : It can be a <literal>FolderName</literal> or a <literal>NamePattern</literal> indicating one or more folders to be copied."
+msgid "<emph>Source</emph>: It can be a <literal>FolderName</literal> or a <literal>NamePattern</literal> indicating one or more folders to be copied."
msgstr ""
-#. EgL3W
+#. 5fFnt
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id321584544734273\n"
"help.text"
-msgid "<emph>Destination</emph> : Specifies the <literal>FolderName</literal> into which the single or multiple folders defined in <literal>Source</literal> are to be copied."
+msgid "<emph>Destination</emph>: Specifies the <literal>FolderName</literal> into which the single or multiple folders defined in <literal>Source</literal> are to be copied."
msgstr ""
#. CzQ9A
@@ -8476,13 +10087,13 @@ msgctxt ""
msgid "Wildcard characters are not allowed in <literal>Destination</literal>."
msgstr ""
-#. KCfZf
+#. 2ziFA
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id251584542431525\n"
"help.text"
-msgid "<emph>Overwrite</emph> : If <literal>True</literal> (default), files may be overwritten. The method will fail if <literal>Destination</literal> is readonly, regardless of the value specified in <literal>Overwrite</literal>."
+msgid "<emph>Overwrite</emph>: If <literal>True</literal> (default), files may be overwritten. The method will fail if <literal>Destination</literal> is readonly, regardless of the value specified in <literal>Overwrite</literal>."
msgstr ""
#. niaPD
@@ -8512,13 +10123,13 @@ msgctxt ""
msgid "If the specified folder has a parent folder that does not exist, it is created."
msgstr ""
-#. ZFWUY
+#. G2A8N
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id491584540675469\n"
"help.text"
-msgid "<emph>FolderName</emph> : A string representing the folder to be created. If the folder already exists, an exception will be raised."
+msgid "<emph>FolderName</emph>: A string representing the folder to be created. If the folder already exists, an exception will be raised."
msgstr ""
#. EYSCS
@@ -8539,31 +10150,31 @@ msgctxt ""
msgid "The method returns a <literal>Null</literal> object if an error occurred."
msgstr ""
-#. tykpH
+#. hBQSN
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id901585322689715\n"
"help.text"
-msgid "<emph>FileName</emph> : The name of the file to be created."
+msgid "<emph>FileName</emph>: The name of the file to be created."
msgstr ""
-#. ZcmDb
+#. VkGyb
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id501585322689209\n"
"help.text"
-msgid "<emph>Overwrite</emph> : Boolean value that determines if <literal>FileName</literal> can be overwritten (default = <literal>True</literal>)."
+msgid "<emph>Overwrite</emph>: Boolean value that determines if <literal>FileName</literal> can be overwritten (default = <literal>True</literal>)."
msgstr ""
-#. X7GW9
+#. Zp6H3
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id551585322689192\n"
"help.text"
-msgid "<emph>Encoding</emph> : The character set to be used. The default encoding is \"UTF-8\"."
+msgid "<emph>Encoding</emph>: The character set to be used. The default encoding is \"UTF-8\"."
msgstr ""
#. eoE92
@@ -8611,13 +10222,13 @@ msgctxt ""
msgid "The method stops immediately after it encounters an error. The method does not roll back nor does it undo changes made before the error occurred."
msgstr ""
-#. D8kDv
+#. 2k57M
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id441584882040860\n"
"help.text"
-msgid "<emph>FileName</emph> : It can be a <literal>FileName</literal> or a <literal>NamePattern</literal> indicating one or more files to be deleted."
+msgid "<emph>FileName</emph>: It can be a <literal>FileName</literal> or a <literal>NamePattern</literal> indicating one or more files to be deleted."
msgstr ""
#. YtAfH
@@ -8665,13 +10276,13 @@ msgctxt ""
msgid "The method stops immediately after it encounters an error. The method does not roll back nor does it undo changes made before the error occurred."
msgstr ""
-#. zdaKv
+#. ecg9D
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id451584882542247\n"
"help.text"
-msgid "<emph>FolderName</emph> : It can be a <literal>FolderName</literal> or a <literal>NamePattern</literal> indicating one or more folders to be deleted."
+msgid "<emph>FolderName</emph>: It can be a <literal>FolderName</literal> or a <literal>NamePattern</literal> indicating one or more folders to be deleted."
msgstr ""
#. ECKGi
@@ -8701,13 +10312,13 @@ msgctxt ""
msgid "If the <literal>FileName</literal> parameter is actually an existing folder name, the method returns <literal>False</literal>."
msgstr ""
-#. 5sCo3
+#. 7pDFB
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id361583764426547\n"
"help.text"
-msgid "<emph>FileName</emph> : A string representing the file to be tested."
+msgid "<emph>FileName</emph>: A string representing the file to be tested."
msgstr ""
#. ChDCL
@@ -8737,22 +10348,22 @@ msgctxt ""
msgid "The resulting list may be filtered with wildcards."
msgstr ""
-#. QFJEd
+#. YsYdQ
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id731583944543140\n"
"help.text"
-msgid "<emph>FolderName</emph> : A string representing a folder. The folder must exist. <literal>FolderName</literal> must not designate a file."
+msgid "<emph>FolderName</emph>: A string representing a folder. The folder must exist. <literal>FolderName</literal> must not designate a file."
msgstr ""
-#. 6qDtR
+#. V95Bm
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id591585648450060\n"
"help.text"
-msgid "<emph>Filter</emph> : A string containing wildcards (\"?\" and \"*\") that will be applied to the resulting list of files (default = \"\")."
+msgid "<emph>Filter</emph>: A string containing wildcards (\"?\" and \"*\") that will be applied to the resulting list of files (default = \"\")."
msgstr ""
#. HJ9vL
@@ -8782,13 +10393,13 @@ msgctxt ""
msgid "If the <literal>FolderName</literal> parameter is actually an existing file name, the method returns <literal>False</literal>."
msgstr ""
-#. SQVF8
+#. Z46FB
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id1001583765642211\n"
"help.text"
-msgid "<emph>FolderName</emph> : A string representing the folder to be tested."
+msgid "<emph>FolderName</emph>: A string representing the folder to be tested."
msgstr ""
#. eAFVs
@@ -8809,13 +10420,13 @@ msgctxt ""
msgid "The method does not check if the specified file or folder exists."
msgstr ""
-#. kotiz
+#. B3jVo
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id691584110618308\n"
"help.text"
-msgid "<emph>FileName</emph> : A string representing the file name and its path."
+msgid "<emph>FileName</emph>: A string representing the file name and its path."
msgstr ""
#. VcGyZ
@@ -8863,13 +10474,13 @@ msgctxt ""
msgid "If this method is applied to a folder name or to a file without an extension, then an empty string is returned."
msgstr ""
-#. tQpBe
+#. GDoGW
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id821584032680311\n"
"help.text"
-msgid "<emph>FileName</emph> : A string representing the file name and its path."
+msgid "<emph>FileName</emph>: A string representing the file name and its path."
msgstr ""
#. Am6Bu
@@ -8890,13 +10501,13 @@ msgctxt ""
msgid "The <literal>GetFileLen</literal> method can handle files with much larger sizes by returning a <literal>Currency</literal> value."
msgstr ""
-#. cC9GE
+#. FvwV6
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id161600685050367\n"
"help.text"
-msgid "<emph>FileName</emph> : A string representing an existing file."
+msgid "<emph>FileName</emph>: A string representing an existing file."
msgstr ""
#. o2GGJ
@@ -8908,13 +10519,13 @@ msgctxt ""
msgid "Returns the last modified date of a given file."
msgstr ""
-#. ssSmV
+#. dxpgz
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id25158481147822\n"
"help.text"
-msgid "<emph>FileName</emph> : A string representing an existing file."
+msgid "<emph>FileName</emph>: A string representing an existing file."
msgstr ""
#. VEZR6
@@ -8935,13 +10546,13 @@ msgctxt ""
msgid "The method does not check if the specified file or folder exists."
msgstr ""
-#. DHaix
+#. VWPoq
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id671584032366193\n"
"help.text"
-msgid "<emph>FileName</emph> : A string representing the file name and its path."
+msgid "<emph>FileName</emph>: A string representing the file name and its path."
msgstr ""
#. ffxFe
@@ -8962,13 +10573,13 @@ msgctxt ""
msgid "The method does not check if the specified file or folder exists."
msgstr ""
-#. Gqc5k
+#. XDmYQ
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id471584113432231\n"
"help.text"
-msgid "<emph>FileName</emph> : A string with the file or folder name to be analyzed."
+msgid "<emph>FileName</emph>: A string with the file or folder name to be analyzed."
msgstr ""
#. Uc93M
@@ -9025,22 +10636,22 @@ msgctxt ""
msgid "The hash algorithms supported are: <literal>MD5</literal>, <literal>SHA1</literal>, <literal>SHA224</literal>, <literal>SHA256</literal>, <literal>SHA384</literal> and <literal>SHA512</literal>."
msgstr ""
-#. 5FXjQ
+#. jTMPS
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id28160104251451\n"
"help.text"
-msgid "<emph>FileName</emph> : A string representing an existing file."
+msgid "<emph>FileName</emph>: A string representing an existing file."
msgstr ""
-#. 88LmG
+#. F86KG
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id71601042959846\n"
"help.text"
-msgid "<emph>Algorithm</emph> : One of the supported algorithms."
+msgid "<emph>Algorithm</emph>: One of the supported algorithms."
msgstr ""
#. HzFs2
@@ -9070,22 +10681,22 @@ msgctxt ""
msgid "The method stops immediately after it encounters an error. The method does not roll back nor does it undo changes made before the error occurred."
msgstr ""
-#. RY5vD
+#. LAeis
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id721584791330406\n"
"help.text"
-msgid "<emph>Source</emph> : It can be a <literal>FileName</literal> or <literal>NamePattern</literal> to designate one or more files to be moved."
+msgid "<emph>Source</emph>: It can be a <literal>FileName</literal> or <literal>NamePattern</literal> to designate one or more files to be moved."
msgstr ""
-#. 5CsKP
+#. rgNqi
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id291584791330181\n"
"help.text"
-msgid "<emph>Destination</emph> : If <literal>Source</literal> is a <literal>FileName</literal> then this parameter indicates the new path and file name of the moved file."
+msgid "<emph>Destination</emph>: If <literal>Source</literal> is a <literal>FileName</literal> then this parameter indicates the new path and file name of the moved file."
msgstr ""
#. E7BHq
@@ -9151,22 +10762,22 @@ msgctxt ""
msgid "The method stops immediately after it encounters an error. The method does not roll back nor does it undo changes made before the error occurred."
msgstr ""
-#. wBkni
+#. tLxAt
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id541584791330777\n"
"help.text"
-msgid "<emph>Source</emph> : It can be a <literal>FolderName</literal> or <literal>NamePattern</literal> to designate one or more folders to be moved."
+msgid "<emph>Source</emph>: It can be a <literal>FolderName</literal> or <literal>NamePattern</literal> to designate one or more folders to be moved."
msgstr ""
-#. By4Cy
+#. bTWWF
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id551584791330279\n"
"help.text"
-msgid "<emph>Destination</emph> : If the move operation involves a single folder, then <literal>Destination</literal> is the name and path of the moved folder and it must not exist."
+msgid "<emph>Destination</emph>: If the move operation involves a single folder, then <literal>Destination</literal> is the name and path of the moved folder and it must not exist."
msgstr ""
#. upwt8
@@ -9214,31 +10825,31 @@ msgctxt ""
msgid "The method returns a <literal>Null</literal> object if an error occurred."
msgstr ""
-#. CBiwE
+#. R5a4m
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id551585320922678\n"
"help.text"
-msgid "<emph>FileName</emph> : Identifies the file to open."
+msgid "<emph>FileName</emph>: Identifies the file to open."
msgstr ""
-#. wr4wi
+#. FUxVH
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id671585320922388\n"
"help.text"
-msgid "<emph>IOMode</emph> : Indicates the input/output mode. It can be one of three constants: <literal>FSO.ForReading</literal> (default), <literal>FSO.ForWriting</literal>, or <literal>FSO.ForAppending</literal>."
+msgid "<emph>IOMode</emph>: Indicates the input/output mode. It can be one of three constants: <literal>FSO.ForReading</literal> (default), <literal>FSO.ForWriting</literal>, or <literal>FSO.ForAppending</literal>."
msgstr ""
-#. 25nRj
+#. ttSYS
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id21585321398586\n"
"help.text"
-msgid "<emph>Create</emph> : Boolean value that indicates whether a new file can be created if the specified filename doesn't exist:"
+msgid "<emph>Create</emph>: Boolean value that indicates whether a new file can be created if the specified filename doesn't exist:"
msgstr ""
#. VDFAi
@@ -9259,13 +10870,13 @@ msgctxt ""
msgid "If <literal>False</literal> then new files are not created (default)."
msgstr ""
-#. WzDqZ
+#. BoVQQ
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id771585321576210\n"
"help.text"
-msgid "<emph>Encoding</emph> : The character set to be used. The default encoding is \"UTF-8\"."
+msgid "<emph>Encoding</emph>: The character set to be used. The default encoding is \"UTF-8\"."
msgstr ""
#. FuYwe
@@ -9286,13 +10897,13 @@ msgctxt ""
msgid "If the <literal>SAVE</literal> mode is set and the picked file exists, a warning message will be displayed."
msgstr ""
-#. gi6um
+#. PAaAH
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id481583670342502\n"
"help.text"
-msgid "<emph>DefaultFile</emph> : This argument is a string composed of a folder and file name:"
+msgid "<emph>DefaultFile</emph>: This argument is a string composed of a folder and file name:"
msgstr ""
#. fyVCs
@@ -9313,22 +10924,22 @@ msgctxt ""
msgid "The file part designates the default file to open or save."
msgstr ""
-#. CyhXn
+#. rcast
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id981583670342502\n"
"help.text"
-msgid "<emph>Mode</emph> : <literal>OPEN</literal> (input file) or <literal>SAVE</literal> (output file). The default value is <literal>OPEN</literal>."
+msgid "<emph>Mode</emph>: <literal>OPEN</literal> (input file) or <literal>SAVE</literal> (output file). The default value is <literal>OPEN</literal>."
msgstr ""
-#. Ym5VM
+#. Dtmio
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id31583670342502\n"
"help.text"
-msgid "<emph>Filter</emph> : The extension of the files displayed when the dialog is opened (default = no filter)."
+msgid "<emph>Filter</emph>: The extension of the files displayed when the dialog is opened (default = no filter)."
msgstr ""
#. 8WirR
@@ -9349,22 +10960,22 @@ msgctxt ""
msgid "Opens a dialog box to select a folder."
msgstr ""
-#. nQtNH
+#. coL3A
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id951583671701872\n"
"help.text"
-msgid "<emph>DefaultFolder</emph> : A string containing the folder name that will be displayed when the dialog is opened (default = the last selected folder)."
+msgid "<emph>DefaultFolder</emph>: A string containing the folder name that will be displayed when the dialog is opened (default = the last selected folder)."
msgstr ""
-#. hspKF
+#. esSGJ
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id821583671701764\n"
"help.text"
-msgid "<emph>FreeText</emph> : Text to display in the dialog (default = \"\")."
+msgid "<emph>FreeText</emph>: Text to display in the dialog (default = \"\")."
msgstr ""
#. GMYtx
@@ -9394,22 +11005,22 @@ msgctxt ""
msgid "The list may be filtered with wildcards."
msgstr ""
-#. vXLY5
+#. ApGN7
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id701584016761945\n"
"help.text"
-msgid "<emph>FolderName</emph> : A string representing a folder. The folder must exist. <literal>FolderName</literal> must not designate a file."
+msgid "<emph>FolderName</emph>: A string representing a folder. The folder must exist. <literal>FolderName</literal> must not designate a file."
msgstr ""
-#. XSBWe
+#. zHooS
#: sf_filesystem.xhp
msgctxt ""
"sf_filesystem.xhp\n"
"par_id471585648674921\n"
"help.text"
-msgid "<emph>Filter</emph> : A string containing wildcards (\"?\" and \"*\") that will be applied to the resulting list of folders (default = \"\")."
+msgid "<emph>Filter</emph>: A string containing wildcards (\"?\" and \"*\") that will be applied to the resulting list of folders (default = \"\")."
msgstr ""
#. WVhEh
@@ -9430,6 +11041,1005 @@ msgctxt ""
msgid "<link href=\"text/sbasic/shared/03020103.xhp\" name=\"Open statement\">Open Statement</link>"
msgstr ""
+#. VCRTD
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"tit\n"
+"help.text"
+msgid "ScriptForge.L10N service"
+msgstr ""
+
+#. q7BSh
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"hd_id521585843652750\n"
+"help.text"
+msgid "<variable id=\"L10NService\"><link href=\"text/sbasic/shared/03/sf_l10n.xhp\" name=\"L10N service\"><literal>ScriptForge</literal>.<literal>L10N</literal> service</link></variable>"
+msgstr ""
+
+#. FRAiJ
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id411585843652556\n"
+"help.text"
+msgid "This service provides a number of methods related to the translation of strings with minimal impact on the program's source code. The methods provided by the <literal>L10N</literal> service can be used mainly to:"
+msgstr ""
+
+#. gw2rW
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id601614351922212\n"
+"help.text"
+msgid "Create POT files that can be used as templates for translation of all strings in the program."
+msgstr ""
+
+#. sbVQL
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id131614352196513\n"
+"help.text"
+msgid "Get translated strings at runtime for the language defined in the <literal>Locale</literal> property."
+msgstr ""
+
+#. kCrgU
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id971614966420419\n"
+"help.text"
+msgid "The acronym <literal>L10N</literal> stands for Localization and refers to a set of procedures for translating software to a specific country or region."
+msgstr ""
+
+#. supr5
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id291585843652438\n"
+"help.text"
+msgid "PO files have long been promoted in the free software community as a means to providing multilingual user interfaces. This is accomplished through the use of human-readable text files with a well defined structure that specifies, for any given language, the source language string and the localized string."
+msgstr ""
+
+#. j6xsd
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id181585843652814\n"
+"help.text"
+msgid "The main advantage of the PO format is dissociation of the programmer and the translator. PO files are independent text files, so the programmer can send POT template files to translators, who will then translate their contents and return the translated PO files for each supported language."
+msgstr ""
+
+#. iBQxR
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id811614352321187\n"
+"help.text"
+msgid "The <literal>L10N</literal> service is based on the GNU implementation of PO (portable object) files. To learn more about this file format, visit <link href=\"https://www.gnu.org/software/gettext/manual/html_node/PO-Files.html\" name=\"GetText\">GNU gettext Utilities: PO Files</link>."
+msgstr ""
+
+#. 4CMir
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id91585843652832\n"
+"help.text"
+msgid "This service implements the three methods listed below:"
+msgstr ""
+
+#. fBXDW
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id1158584365237\n"
+"help.text"
+msgid "<emph>AddText</emph>: Used by the programmer to build a set of strings that will be translated later."
+msgstr ""
+
+#. cm7fq
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id681585843652331\n"
+"help.text"
+msgid "<emph>ExportToPOTFile</emph>: Exports the strings added by the <literal>AddText</literal> method to a POT file."
+msgstr ""
+
+#. Z7dU5
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id531585843652697\n"
+"help.text"
+msgid "<emph>GetText</emph>: Gets the translated strings at runtime."
+msgstr ""
+
+#. D4Fyf
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id361614361362393\n"
+"help.text"
+msgid "Note that the first two methods are used to build a set of translatable strings and export them to a POT file. However, it is not mandatory to create POT files using these methods. Since they are text files, the programmer could have created them using any text editor."
+msgstr ""
+
+#. Rn7FL
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"hd_id351585843652312\n"
+"help.text"
+msgid "Service invocation"
+msgstr ""
+
+#. nkcFt
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id421614353247163\n"
+"help.text"
+msgid "To invoke the <literal>L10N</literal> service, two optional arguments can be specified to determine the folder where PO files are located and the locale to be used, as described below."
+msgstr ""
+
+#. u3ENa
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id331585843652877\n"
+"help.text"
+msgid "<emph>FolderName</emph>: The folder containing the PO files. It must be expressed in the <literal>FileSystem.FileNaming</literal> notation."
+msgstr ""
+
+#. 8PpqQ
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id581585843652789\n"
+"help.text"
+msgid "<emph>Locale</emph>: A string in the form \"la-CO\" (language-COUNTRY) or in the form \"la\" (language) only."
+msgstr ""
+
+#. Z5Pb3
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id301614358956087\n"
+"help.text"
+msgid "Several instances of the <literal>L10N</literal> service may coexist. However, each instance must use a separate directory for its PO files."
+msgstr ""
+
+#. 3YPqe
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id891614358528334\n"
+"help.text"
+msgid "The following example instantiates the <literal>L10N</literal> service without any optional arguments. This will only enable the <literal>AddText</literal> and <literal>ExportToPOTFile</literal> methods."
+msgstr ""
+
+#. XUTWZ
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id611614358672609\n"
+"help.text"
+msgid "The example below specifies the folder containing the PO files. Because the locale is not defined, the service instance will use the current %PRODUCTNAME locale settings."
+msgstr ""
+
+#. RmYkJ
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"bas_id451614358683971\n"
+"help.text"
+msgid "Set myPO = CreateScriptService(\"L10N\", \"C:\\myPOFiles\\\")"
+msgstr ""
+
+#. Ab7iH
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id321614358809763\n"
+"help.text"
+msgid "In the example below, both the folder name and locale settings are explicitly defined to be Belgian French."
+msgstr ""
+
+#. zEgWG
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"bas_id661614358846464\n"
+"help.text"
+msgid "Set myPO = CreateScriptService(\"L10N\", \"C:\\myPOFiles\\\", \"fr-BE\")"
+msgstr ""
+
+#. UGFWB
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id411585843652496\n"
+"help.text"
+msgid "PO files must be named in the form \"la-CO.po\" or \"la.po\", where \"la\" refers to the language and \"CO\" is the country. Some examples are: \"en-US.po\", \"fr-BE.po\" or \"fr.po\"."
+msgstr ""
+
+#. zQhHX
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id171585843652545\n"
+"help.text"
+msgid "It is recommended to free resources after use:"
+msgstr ""
+
+#. M9GLd
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"bm_id871614359551930\n"
+"help.text"
+msgid "<bookmark_value>L10N service;Folder</bookmark_value> <bookmark_value>L10N service;Languages</bookmark_value> <bookmark_value>L10N service;Locale</bookmark_value>"
+msgstr ""
+
+#. 6mcLb
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"hd_id561585843652465\n"
+"help.text"
+msgid "Properties"
+msgstr ""
+
+#. mJaFd
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id181585843652958\n"
+"help.text"
+msgid "Name"
+msgstr ""
+
+#. FFbDK
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id741585843652162\n"
+"help.text"
+msgid "Readonly"
+msgstr ""
+
+#. X3tJK
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id291585843652823\n"
+"help.text"
+msgid "Type"
+msgstr ""
+
+#. 8ECBX
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id351585843652638\n"
+"help.text"
+msgid "Description"
+msgstr ""
+
+#. j3wEj
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id451585843652928\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. uED9S
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id751585843652642\n"
+"help.text"
+msgid "The folder containing the PO files (see the <link href=\"text/sbasic/shared/03/sf_filesystem.xhp#bm_id901612991354326\" name=\"FileNaming property\"><literal>FileSystem.FileNaming</literal></link> property to learn about the notation used)."
+msgstr ""
+
+#. Zsp7p
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id96158584365279\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. vdfiw
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id331585843652912\n"
+"help.text"
+msgid "A zero-based array listing all the base names (without the \".po\" extension) of the PO-files found in the specified <literal>Folder</literal>."
+msgstr ""
+
+#. NWxhu
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id961585843652589\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. LSNA3
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id561585843652947\n"
+"help.text"
+msgid "The currently active language-COUNTRY combination. This property will be initially empty if the service was instantiated without any of the optional arguments."
+msgstr ""
+
+#. 5cs7h
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id231614360519973\n"
+"help.text"
+msgid "List of Methods in the L10N Service"
+msgstr ""
+
+#. Q24j9
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id1001585843652271\n"
+"help.text"
+msgid "Adds a new entry in the list of localizable strings. It must not exist yet."
+msgstr ""
+
+#. WPVrn
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id391585843652753\n"
+"help.text"
+msgid "<emph>Context</emph>: The key to retrieve the translated string with the <literal>GetText</literal> method. This parameter has a default value of \"\"."
+msgstr ""
+
+#. EC7wb
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id581585844419114\n"
+"help.text"
+msgid "<emph>MsgId</emph>: The untranslated string, which is the text appearing in the program code. It must not be empty. The <literal>MsgId</literal> becomes the key to retrieve the translated string via <literal>GetText</literal> method when <literal>Context</literal> is empty."
+msgstr ""
+
+#. X3F7E
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id311614361926844\n"
+"help.text"
+msgid "The <literal>MsgId</literal> string may contain any number of placeholders (%1 %2 %3 ...) for dynamically modifying the string at runtime."
+msgstr ""
+
+#. 9Jgn8
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id541585844475331\n"
+"help.text"
+msgid "<emph>Comment</emph>: Optional comment to be added alongside the string to help translators."
+msgstr ""
+
+#. TAyPG
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id461614364298440\n"
+"help.text"
+msgid "The example below creates a set of strings in English:"
+msgstr ""
+
+#. DqFBf
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id281586102707242\n"
+"help.text"
+msgid "Exports a set of untranslated strings as a POT file."
+msgstr ""
+
+#. zTKQ4
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id711586102939257\n"
+"help.text"
+msgid "To build a set of strings you can use either a succession of <literal>AddText</literal> method calls, or by a successful invocation of the <literal>L10N</literal> service with the <literal>FolderName</literal> argument present. It is also possible to use a combination of both techniques."
+msgstr ""
+
+#. WiqHy
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id31586102707537\n"
+"help.text"
+msgid "<emph>FileName</emph>: The output file in <literal>FileSystem.FileNaming</literal> notation."
+msgstr ""
+
+#. BkEjG
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id851586102707579\n"
+"help.text"
+msgid "<emph>Header</emph>: Comments that will be added on top of the generated POT file."
+msgstr ""
+
+#. qfPvB
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id111614364686973\n"
+"help.text"
+msgid "Do not include any leading \"#\" characters. If you want the header to be broken into multiple lines, insert escape sequences (\\n) where relevant. A standard header will be added alongside the text specified in the <literal>Header</literal> argument."
+msgstr ""
+
+#. rUUCt
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id5158610270728\n"
+"help.text"
+msgid "<emph>Encoding</emph>: The character set to be used (Default = \"UTF-8\")."
+msgstr ""
+
+#. uDu7z
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id581614364494235\n"
+"help.text"
+msgid "The generated file should successfully pass the <literal>msgfmt --check</literal> GNU command."
+msgstr ""
+
+#. wBAjb
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id891586165768715\n"
+"help.text"
+msgid "Gets the translated string corresponding to the given <literal>MsgId</literal> argument."
+msgstr ""
+
+#. NzGZC
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id291614365296959\n"
+"help.text"
+msgid "A list of arguments may be specified to replace the placeholders (%1, %2, ...) in the string."
+msgstr ""
+
+#. 9DBFa
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id231586166181909\n"
+"help.text"
+msgid "If no translated string is found, the method returns the untranslated string after replacing the placeholders with the specified arguments."
+msgstr ""
+
+#. bAcmJ
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id871586352505927\n"
+"help.text"
+msgid "This method can be called either by the full name <literal>GetText</literal> or by the shortcut <literal>_</literal> (a single underscore):"
+msgstr ""
+
+#. NzdBC
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id421614967136502\n"
+"help.text"
+msgid "In the ScriptForge library, all methods starting with the \"_\" character are reserved for internal use only. However, the shortcut <literal>_</literal> used for <literal>GetText</literal> is the only exception to this rule, hence it can be safely used in Basic scripts."
+msgstr ""
+
+#. rNrAw
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id51586165768525\n"
+"help.text"
+msgid "<emph>MsgId</emph>: The untranslated string, which is the text appearing in the program code. It must not be empty. It may contain any number of placeholders (%1 %2 %3 ...) that can be used to dynamically insert text at runtime."
+msgstr ""
+
+#. Fummg
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id11614365537450\n"
+"help.text"
+msgid "Besides using a single <literal>MsgId</literal> string, this method also accepts the following formats:"
+msgstr ""
+
+#. fD2Bg
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id961614365557277\n"
+"help.text"
+msgid "The <literal>Context</literal> string with which the method will retrieve the <literal>MsgId</literal> in the PO file, or;"
+msgstr ""
+
+#. v6nVR
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id981614365589866\n"
+"help.text"
+msgid "A combination <literal>Context|MsgId</literal>, instructing the method to retrieve the <literal>MsgId</literal> using specified <literal>Context</literal> value. The second part of the argument is used to improve code readability."
+msgstr ""
+
+#. 5zB4f
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id571586165768106\n"
+"help.text"
+msgid "<emph>Arg1, ...</emph>: Values to be inserted into the placeholders. Any variable type is allowed, however only strings, numbers and dates will be considered."
+msgstr ""
+
+#. cCZDK
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id701614365961454\n"
+"help.text"
+msgid "Consider the following code is running on a %PRODUCTNAME installation with locale set to \"es-ES\". Additionally, there is a file \"es-ES.po\" inside the specified folder that translates the string passed to the <literal>GetText</literal> method:"
+msgstr ""
+
+#. Kz4S7
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"bas_id171614366110835\n"
+"help.text"
+msgid "myPO = CreateScriptService(\"L10N\", \"c:\\MyPOFolder\\\")"
+msgstr ""
+
+#. EcBzr
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"bas_id1001586166834936\n"
+"help.text"
+msgid "' \"¡Bienvenido John! Espero que disfrutes de este programa\""
+msgstr ""
+
+#. H4aXx
+#: sf_l10n.xhp
+msgctxt ""
+"sf_l10n.xhp\n"
+"par_id301613075694148\n"
+"help.text"
+msgid "<link href=\"text/sbasic/guide/translation.xhp\" name=\"Controls Translation\"> Translation of Controls in the Dialog Editor</link>"
+msgstr ""
+
+#. Ah5Gj
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"tit\n"
+"help.text"
+msgid "ScriptForge.Platform service"
+msgstr ""
+
+#. PCkEG
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"bm_id681600788076499\n"
+"help.text"
+msgid "<variable id=\"PlatformService\"><link href=\"text/sbasic/shared/03/sf_platform.xhp\" name=\"Platform service\"><literal>ScriptForge</literal>.<literal>Platform</literal> service</link></variable>"
+msgstr ""
+
+#. 7D6Dx
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id181600788076612\n"
+"help.text"
+msgid "The <literal>Platform</literal> service provides a collection of properties about the current execution environment and context, such as:"
+msgstr ""
+
+#. FDJFB
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id301600788076785\n"
+"help.text"
+msgid "The hardware platform (architecture, CPU count, machine type, etc)"
+msgstr ""
+
+#. i9FbJ
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id1001600788076848\n"
+"help.text"
+msgid "Operating system information (OS type, release, version, etc)"
+msgstr ""
+
+#. uPLtj
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id67160078807676\n"
+"help.text"
+msgid "The LibreOffice version"
+msgstr ""
+
+#. BrEr7
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id671600788076855\n"
+"help.text"
+msgid "The current user name"
+msgstr ""
+
+#. ZvBqs
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id951614903258253\n"
+"help.text"
+msgid "All properties of the <literal>Platform</literal> service are read-only."
+msgstr ""
+
+#. iK4Gv
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"hd_id281600788076359\n"
+"help.text"
+msgid "Service invocation"
+msgstr ""
+
+#. Emisv
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id321614902851541\n"
+"help.text"
+msgid "The code snippet below instantiates the <literal>Platform</literal> service and accesses the <literal>Architecture</literal> property."
+msgstr ""
+
+#. KC5eN
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"hd_id711600788076834\n"
+"help.text"
+msgid "Properties"
+msgstr ""
+
+#. VXJ8a
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id461600788076917\n"
+"help.text"
+msgid "Name"
+msgstr ""
+
+#. JN68D
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id221600788076591\n"
+"help.text"
+msgid "Readonly"
+msgstr ""
+
+#. ZndAt
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id761600788076328\n"
+"help.text"
+msgid "Type"
+msgstr ""
+
+#. dAoKA
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id67160078807636\n"
+"help.text"
+msgid "Description"
+msgstr ""
+
+#. XdLGG
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id311600788076756\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. EEWuL
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id441600788076826\n"
+"help.text"
+msgid "The hardware bit architecture. Example: '<literal>32bit</literal>' or '<literal>64bit</literal>'"
+msgstr ""
+
+#. 8EZ8A
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id49160078807654\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. iG4iH
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id81600788076419\n"
+"help.text"
+msgid "The computer's network name."
+msgstr ""
+
+#. hvAeY
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id711600788076534\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. g5EUJ
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id541600788076645\n"
+"help.text"
+msgid "The number of central processor units."
+msgstr ""
+
+#. 89Lo8
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id891600788076190\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. rmGRV
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id91600788076674\n"
+"help.text"
+msgid "The name of the currently logged user."
+msgstr ""
+
+#. Dt7J5
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id391600788076253\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. LA6EN
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id21600788076541\n"
+"help.text"
+msgid "The machine type. Examples are: '<literal>i386</literal>' or '<literal>x86_64</literal>'."
+msgstr ""
+
+#. tqwyD
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id211600788076138\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. 9uRw8
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id521600788076371\n"
+"help.text"
+msgid "The actual LibreOffice version expressed as<br/>'<literal>LibreOffice w.x.y.z (The Document Foundation)</literal>'."
+msgstr ""
+
+#. 4bpcJ
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id621614902220807\n"
+"help.text"
+msgid "Example: '<literal>LibreOffice 7.1.1.2 (The Document Foundation, Debian and Ubuntu)</literal>'"
+msgstr ""
+
+#. 7WDer
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id21600788076758\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. NUSby
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id781600788076694\n"
+"help.text"
+msgid "The operating system type. Example: '<literal>Darwin</literal>, <literal>Linux</literal>' or '<literal>Windows</literal>'."
+msgstr ""
+
+#. cLiaw
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id261600788076841\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. nepQ6
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id11600788076757\n"
+"help.text"
+msgid "A single string identifying the underlying platform with as much useful and human-readable information as possible."
+msgstr ""
+
+#. EH36m
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id501614902381381\n"
+"help.text"
+msgid "Example: '<literal>Linux-5.8.0-44-generic-x86_64-with-glibc2.32</literal>'"
+msgstr ""
+
+#. hbyth
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id531600789141795\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. 4iEvV
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id301600789141619\n"
+"help.text"
+msgid "The operating system's release. Example: '<literal>5.8.0-44-generic</literal>'"
+msgstr ""
+
+#. 2fBtD
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id541600789286532\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. iukPq
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id701600789286280\n"
+"help.text"
+msgid "The operating system's build or version."
+msgstr ""
+
+#. DWQNA
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id351614902520555\n"
+"help.text"
+msgid "Example: '<literal>#50-Ubuntu SMP Tue Feb 9 06:29:41 UTC 2021</literal>'"
+msgstr ""
+
+#. fCdYi
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id941600789527698\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. wkthE
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id631600789527859\n"
+"help.text"
+msgid "The real processor name. Example: '<literal>amdk6</literal>'."
+msgstr ""
+
+#. MYY9M
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id111614902598396\n"
+"help.text"
+msgid "This property may return the same value as the <literal>Machine</literal> property."
+msgstr ""
+
+#. 4pnPw
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id301613075694148\n"
+"help.text"
+msgid "<link href=\"text/sbasic/python/python_platform.xhp\" name=\"OS python\">Identifying the operating system</link>"
+msgstr ""
+
+#. UCfLb
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id301613065794148\n"
+"help.text"
+msgid "<link href=\"text/scalc/01/04060104.xhp\" name=\"Platform information with Calc INFO formula\">Platform information with INFO(\"system\") Calc formula</link>"
+msgstr ""
+
+#. PqDHG
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id103613075694148\n"
+"help.text"
+msgid "<link href=\"text/sbasic/shared/03132100.xhp\" name=\"GetGuiType Function\">GetGuiType function</link>"
+msgstr ""
+
+#. DAfoV
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id301316075694148\n"
+"help.text"
+msgid "<link href=\"text/sbasic/shared/03/lib_tools.xhp\" name=\"Tools library\">Tools library</link>"
+msgstr ""
+
#. GpvmN
#: sf_services.xhp
msgctxt ""
@@ -11392,13 +14002,13 @@ msgctxt ""
msgid "You can use the properties above to identify or insert the corresponding characters inside strings. For example, the Linefeed can be replaced by <literal>SF_String.sfLF</literal>."
msgstr ""
-#. WSwjJ
+#. TFfR3
#: sf_string.xhp
msgctxt ""
"sf_string.xhp\n"
"par_id151611951803163\n"
"help.text"
-msgid "The first argument of most methods is the string to be considered. It is always passed by reference and left unchanged. Methods such as Capitalize, Escape, etc return a new string after their execution."
+msgid "The first argument of most methods is the string to be considered. It is always passed by reference and left unchanged. Methods such as <literal>Capitalize</literal>, <literal>Escape</literal>, etc return a new string after their execution."
msgstr ""
#. jaBZR
@@ -12652,13 +15262,13 @@ msgctxt ""
msgid "If <literal>OldStr</literal> and <literal>NewStr</literal> are arrays, replacements occur one by one up to the <literal>UBound(NewStr)</literal>."
msgstr ""
-#. HDGCx
+#. qUhcr
#: sf_string.xhp
msgctxt ""
"sf_string.xhp\n"
"par_id241612385058264\n"
"help.text"
-msgid "If <literal>OldStr</literal> has more entries than <literal>NewStr</literal>, than the residual elements in <literal>OldStr</literal> are replaced by the last element in <literal>NewStr</literal>."
+msgid "If <literal>OldStr</literal> has more entries than <literal>NewStr</literal>, then the residual elements in <literal>OldStr</literal> are replaced by the last element in <literal>NewStr</literal>."
msgstr ""
#. oTqRh
@@ -13129,6 +15739,564 @@ msgctxt ""
msgid "<link href=\"text/sbasic/shared/03120202.xhp\" name=\"String function\">String built-in function</link>"
msgstr ""
+#. HjZDB
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"tit\n"
+"help.text"
+msgid "ScriptForge.TextStream service"
+msgstr ""
+
+#. cEA5U
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bm_id351585330787295\n"
+"help.text"
+msgid "<variable id=\"TextStreamService\"><link href=\"text/sbasic/shared/03/sf_textstream.xhp\" name=\"TextStream service\"><literal>ScriptForge</literal>.<literal>TextStream</literal> service</link></variable>"
+msgstr ""
+
+#. nBJsE
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id511585330787205\n"
+"help.text"
+msgid "The <literal>TextStream</literal> service is used to sequentially read from and write to files opened or created using the <literal>ScriptForge.FileSystem</literal> service."
+msgstr ""
+
+#. TeRTa
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id41613596903894\n"
+"help.text"
+msgid "The methods <literal>OpenTextFile</literal> and <literal>CreateTextFile</literal> from the <literal>FileSystem</literal> service return an instance of the <literal>TextStream</literal> service."
+msgstr ""
+
+#. MVFWC
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id161585330787262\n"
+"help.text"
+msgid "Line delimiters may be specified by the user. In input operations CR, LF or CR+LF are supported. In output operations, the default line delimiter is the one used by the operating system."
+msgstr ""
+
+#. GDkir
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id831613598137669\n"
+"help.text"
+msgid "The line delimiter for the operating system where the macro is being executed can be accessed using the <literal>SF_String.sfNEWLINE</literal> property."
+msgstr ""
+
+#. SvXzF
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id851613597445432\n"
+"help.text"
+msgid "All operations needed to read from or write to a file (open, read/write and close) are presumed to happen during the same macro run."
+msgstr ""
+
+#. U6RHd
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"hd_id83158533078741\n"
+"help.text"
+msgid "Service instantiation"
+msgstr ""
+
+#. c7WYC
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id351613598192725\n"
+"help.text"
+msgid "The code snippet below uses the <literal>OpenTextFile</literal> method to create an instance of the <literal>TextStream</literal> Service."
+msgstr ""
+
+#. UUudg
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id371585330787197\n"
+"help.text"
+msgid "The file must be closed with the <literal>CloseFile</literal> method after all read or write operations have been executed:"
+msgstr ""
+
+#. uCC2B
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bas_id91613599192241\n"
+"help.text"
+msgid "myFile.CloseFile()"
+msgstr ""
+
+#. zNveN
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id891582733781994\n"
+"help.text"
+msgid "Optionally, the resources used by the <literal>TextStream</literal> instance can be released using the <literal>Dispose</literal> method:"
+msgstr ""
+
+#. LnYGk
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bas_id761613599333614\n"
+"help.text"
+msgid "Set myFile = myFile.Dispose()"
+msgstr ""
+
+#. nsGCZ
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id121612917368946\n"
+"help.text"
+msgid "The methods in the <literal>TextStream</literal> service are mostly based on the <link href=\"https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1io_1_1XTextInputStream.html\" name=\"XTextInputStream API\"><literal>XTextInputStream</literal></link> and <link href=\"https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1io_1_1XTextOutputStream.html\" name=\"XTextOutputStream API\"><literal>XTextOutputStream</literal></link> UNO interfaces."
+msgstr ""
+
+#. JAmgD
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"hd_id941585330787948\n"
+"help.text"
+msgid "Properties"
+msgstr ""
+
+#. aZttT
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bm_id1001613600572485\n"
+"help.text"
+msgid "<bookmark_value>TextStream service;AtEndOfStream</bookmark_value> <bookmark_value>TextStream service;Encoding</bookmark_value> <bookmark_value>TextStream service;FileName</bookmark_value> <bookmark_value>TextStream service;IOMode</bookmark_value> <bookmark_value>TextStream service;Line</bookmark_value> <bookmark_value>TextStream service;NewLine</bookmark_value>"
+msgstr ""
+
+#. aN9zM
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id631585330787267\n"
+"help.text"
+msgid "Name"
+msgstr ""
+
+#. vwGC5
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id401585330787370\n"
+"help.text"
+msgid "Readonly"
+msgstr ""
+
+#. GpL38
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id581585330787700\n"
+"help.text"
+msgid "Type"
+msgstr ""
+
+#. 6FDuM
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id551585330787608\n"
+"help.text"
+msgid "Description"
+msgstr ""
+
+#. ECkTm
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id181585330787752\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. YFkaY
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id901585330787680\n"
+"help.text"
+msgid "Used in read mode. A <literal>True</literal> value indicates that the end of the file has been reached. A test using this property should precede calls to the <literal>ReadLine</literal> method."
+msgstr ""
+
+#. EFEnA
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id561585330787568\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. cVCoJ
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id741585330787777\n"
+"help.text"
+msgid "The character set to be used. The default encoding is \"UTF-8\"."
+msgstr ""
+
+#. p5s3X
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id641585330787207\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. JjEqX
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id281585330787614\n"
+"help.text"
+msgid "Returns the name of the current file either in URL format or in the native operating system's format, depending on the current value of the <literal>FileNaming</literal> property of the <literal>FileSystem</literal> service."
+msgstr ""
+
+#. goEnw
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id111585330787410\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. MZS6Z
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id861585330787417\n"
+"help.text"
+msgid "Indicates the input/output mode. Possible values are \"READ\", \"WRITE\" or \"APPEND\"."
+msgstr ""
+
+#. 7nTb9
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id87158533078795\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. j45gC
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id561585330787741\n"
+"help.text"
+msgid "Returns the number of lines read or written so far."
+msgstr ""
+
+#. CLAvQ
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id531585330787157\n"
+"help.text"
+msgid "No"
+msgstr ""
+
+#. rdA5M
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id691585330787279\n"
+"help.text"
+msgid "Sets or returns the current delimiter to be inserted between two successive written lines. The default value is the native line delimiter in the current operating system."
+msgstr ""
+
+#. dCeHZ
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id141613001281573\n"
+"help.text"
+msgid "To learn more about the names of character sets, visit <link href=\"https://www.iana.org/assignments/character-sets/character-sets.xhtml\" name=\"Character Sets\">IANA's Character Set</link> page. Beware that %PRODUCTNAME does not implement all existing character sets."
+msgstr ""
+
+#. hKJkD
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id891611613601554\n"
+"help.text"
+msgid "List of Methods in the TextStream Service"
+msgstr ""
+
+#. DBBKM
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id421585330787675\n"
+"help.text"
+msgid "Closes the current input or output stream and empties the output buffer if relevant. Returns <literal>True</literal> if the file was successfully closed."
+msgstr ""
+
+#. MCW3q
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id65158533078799\n"
+"help.text"
+msgid "Returns all the remaining lines in the text stream as a single string. Line breaks are not removed."
+msgstr ""
+
+#. Vr34D
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id71613600347125\n"
+"help.text"
+msgid "The resulting string can be split in lines either by using the <literal>Split</literal> built-in Basic function if the line delimiter is known, or with the <literal>SF_String.SplitLines</literal> method."
+msgstr ""
+
+#. VRLGn
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id91585330787373\n"
+"help.text"
+msgid "For large files, using the <literal>ReadAll</literal> method wastes memory resources. In such cases it is recommended to read the file line by line using the <literal>ReadLine</literal> method."
+msgstr ""
+
+#. BuBVA
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id921613595637851\n"
+"help.text"
+msgid "Consider the text file \"Students.txt\" with the following contents (a name in each line):"
+msgstr ""
+
+#. dUSey
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id391613596019750\n"
+"help.text"
+msgid "The example below uses the <literal>ReadAll</literal> and <literal>SplitLines</literal> methods to read the contents of the file into an array of strings:"
+msgstr ""
+
+#. BuRJE
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bas_id251613595640550\n"
+"help.text"
+msgid "'Loads the FileSystem service"
+msgstr ""
+
+#. L2a3D
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bas_id181613595641087\n"
+"help.text"
+msgid "'Opens the text file with the names to be read"
+msgstr ""
+
+#. fArny
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bas_id651613595641754\n"
+"help.text"
+msgid "Set inputFile = FSO.OpenTextFile(\"~/Documents/Students.txt\")"
+msgstr ""
+
+#. 9sFB5
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bas_id81613595642474\n"
+"help.text"
+msgid "Dim allData as String"
+msgstr ""
+
+#. a9b3r
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bas_id191613595642766\n"
+"help.text"
+msgid "allData = inputFile.ReadAll()"
+msgstr ""
+
+#. 7Fq9E
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id871585330787885\n"
+"help.text"
+msgid "Returns the next line in the text stream as a string. Line breaks are removed from the returned string."
+msgstr ""
+
+#. 6iDcF
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id431613600221626\n"
+"help.text"
+msgid "The <literal>AtEndOfStream</literal> test should precede the <literal>ReadLine</literal> method like in the example below."
+msgstr ""
+
+#. GRRkq
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id171585330787774\n"
+"help.text"
+msgid "An error will be raised if the <literal>AtEndOfStream</literal> was reached during the previous <literal>ReadLine</literal> or <literal>SkipLine</literal> method call."
+msgstr ""
+
+#. mAty4
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id11585330787847\n"
+"help.text"
+msgid "Skips the next line in the input stream when reading a <literal>TextStream</literal> file."
+msgstr ""
+
+#. FDMJB
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id441613600704766\n"
+"help.text"
+msgid "This method can result in <literal>AtEndOfStream</literal> being set to <literal>True</literal>."
+msgstr ""
+
+#. D4JVb
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id141585330787657\n"
+"help.text"
+msgid "Writes a specified number of empty lines to the output stream."
+msgstr ""
+
+#. NqNwE
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id291585330787357\n"
+"help.text"
+msgid "<emph>Lines</emph>: The number of empty lines to write."
+msgstr ""
+
+#. GCPCC
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id101585330787215\n"
+"help.text"
+msgid "Writes the given string to the output stream as a single line."
+msgstr ""
+
+#. Eska7
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id421613601002074\n"
+"help.text"
+msgid "The character defined in the <literal>NewLine</literal> property is used as the line delimiter."
+msgstr ""
+
+#. YRTuQ
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id491585330787650\n"
+"help.text"
+msgid "<emph>Line</emph>: The line to write, may be empty."
+msgstr ""
+
+#. 39u4o
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bas_id21613321528612\n"
+"help.text"
+msgid "'Instantiates the FileSystem Service"
+msgstr ""
+
+#. FnTiG
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bas_id191613321529277\n"
+"help.text"
+msgid "'Creates a text file"
+msgstr ""
+
+#. f5RSB
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bas_id641613321530181\n"
+"help.text"
+msgid "'Writes the Value and Value squared, separated by \";\""
+msgstr ""
+
+#. FCowk
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bas_id141613321530960\n"
+"help.text"
+msgid "myFile.WriteLine(\"Value;Value Squared\")"
+msgstr ""
+
+#. m9Mo4
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"bas_id881613321532598\n"
+"help.text"
+msgid "'Closes the file and free resources"
+msgstr ""
+
+#. nrDCn
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id301613075694148\n"
+"help.text"
+msgid "<link href=\"text/sbasic/shared/03160000.xhp\" name=\"Input function\">Input Function</link>"
+msgstr ""
+
+#. FnNRc
+#: sf_textstream.xhp
+msgctxt ""
+"sf_textstream.xhp\n"
+"par_id271612398715438\n"
+"help.text"
+msgid "<link href=\"text/sbasic/shared/03020103.xhp\" name=\"Open statement\">Open Statement</link>"
+msgstr ""
+
#. PCSPY
#: sf_timer.xhp
msgctxt ""
@@ -13435,15 +16603,6 @@ msgctxt ""
msgid "Returned value"
msgstr ""
-#. S6Gay
-#: sf_timer.xhp
-msgctxt ""
-"sf_timer.xhp\n"
-"par_id31582734180676\n"
-"help.text"
-msgid "Continue"
-msgstr ""
-
#. C2QQ4
#: sf_timer.xhp
msgctxt ""
@@ -13462,15 +16621,6 @@ msgctxt ""
msgid "<literal>False</literal> if the timer is not suspended"
msgstr ""
-#. ASHCm
-#: sf_timer.xhp
-msgctxt ""
-"sf_timer.xhp\n"
-"par_id881582734649304\n"
-"help.text"
-msgid "Restart"
-msgstr ""
-
#. nkUs3
#: sf_timer.xhp
msgctxt ""
@@ -13489,15 +16639,6 @@ msgctxt ""
msgid "<literal>False</literal> if the timer is inactive"
msgstr ""
-#. 7VHEX
-#: sf_timer.xhp
-msgctxt ""
-"sf_timer.xhp\n"
-"par_id201582734802443\n"
-"help.text"
-msgid "Start"
-msgstr ""
-
#. AkgAy
#: sf_timer.xhp
msgctxt ""
@@ -13516,15 +16657,6 @@ msgctxt ""
msgid "<literal>False</literal> if the timer is already started"
msgstr ""
-#. QdjDi
-#: sf_timer.xhp
-msgctxt ""
-"sf_timer.xhp\n"
-"par_id781582734905507\n"
-"help.text"
-msgid "Suspend"
-msgstr ""
-
#. D7CoH
#: sf_timer.xhp
msgctxt ""
@@ -13543,15 +16675,6 @@ msgctxt ""
msgid "<literal>False</literal> if the timer is not started or already suspended"
msgstr ""
-#. BUjcE
-#: sf_timer.xhp
-msgctxt ""
-"sf_timer.xhp\n"
-"par_id771582734996722\n"
-"help.text"
-msgid "Terminate"
-msgstr ""
-
#. sgXra
#: sf_timer.xhp
msgctxt ""
@@ -13579,6 +16702,33 @@ msgctxt ""
msgid "<embedvar href=\"text/sbasic/shared/00000003.xhp#functexample\"/>"
msgstr ""
+#. UgBnC
+#: sf_timer.xhp
+msgctxt ""
+"sf_timer.xhp\n"
+"bas_id141582735926821\n"
+"help.text"
+msgid "'The time elapsed while the Dialog box is open will be counted as suspended time"
+msgstr ""
+
+#. 4jHcj
+#: sf_timer.xhp
+msgctxt ""
+"sf_timer.xhp\n"
+"bas_id901582735961725\n"
+"help.text"
+msgid "'The time elapsed while the Dialog box is open will be counted as running time"
+msgstr ""
+
+#. 7QhZU
+#: sf_timer.xhp
+msgctxt ""
+"sf_timer.xhp\n"
+"bas_id941610739926687\n"
+"help.text"
+msgid "'Shows the final time measurements"
+msgstr ""
+
#. J6XGB
#: sf_timer.xhp
msgctxt ""
@@ -13615,6 +16765,33 @@ msgctxt ""
msgid "The following example illustrates how to create two <literal>Timer</literal> objects and start them separately."
msgstr ""
+#. PtA4E
+#: sf_timer.xhp
+msgctxt ""
+"sf_timer.xhp\n"
+"bas_id481610989853679\n"
+"help.text"
+msgid "'Starts myTimerA"
+msgstr ""
+
+#. VUdGW
+#: sf_timer.xhp
+msgctxt ""
+"sf_timer.xhp\n"
+"bas_id331610989849501\n"
+"help.text"
+msgid "'Starts myTimerB"
+msgstr ""
+
+#. t98Fv
+#: sf_timer.xhp
+msgctxt ""
+"sf_timer.xhp\n"
+"bas_id931610989837747\n"
+"help.text"
+msgid "'Terminate both timers"
+msgstr ""
+
#. CpzL5
#: sf_timer.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/00.po b/source/zh-CN/helpcontent2/source/text/scalc/00.po
index a8e1c336021..7e5073a6a78 100644
--- a/source/zh-CN/helpcontent2/source/text/scalc/00.po
+++ b/source/zh-CN/helpcontent2/source/text/scalc/00.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-02-05 18:59+0100\n"
+"POT-Creation-Date: 2021-03-08 14:39+0100\n"
"PO-Revision-Date: 2020-11-11 21:35+0000\n"
"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
"Language-Team: Chinese (Simplified) <https://weblate.documentfoundation.org/projects/libo_help-master/textscalc00/zh_Hans/>\n"
@@ -1177,13 +1177,13 @@ msgctxt ""
msgid "Window Menu"
msgstr "窗口菜单"
-#. dH2aq
+#. ry53A
#: 00000407.xhp
msgctxt ""
"00000407.xhp\n"
"par_id3147335\n"
"help.text"
-msgid "<variable id=\"fete\">Choose ><menuitem>View - Split Window</menuitem>.</variable>"
+msgid "<variable id=\"fete\">Choose <menuitem>View - Split Window</menuitem>.</variable>"
msgstr ""
#. dr9Aq
diff --git a/source/zh-CN/helpcontent2/source/text/scalc/01.po b/source/zh-CN/helpcontent2/source/text/scalc/01.po
index 35c32264852..e932eb1e99c 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-02-17 15:58+0100\n"
+"POT-Creation-Date: 2021-03-23 11:44+0100\n"
"PO-Revision-Date: 2020-12-05 20:36+0000\n"
"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
"Language-Team: Chinese (Simplified) <https://weblate.documentfoundation.org/projects/libo_help-master/textscalc01/zh_Hans/>\n"
@@ -1033,14 +1033,14 @@ msgctxt ""
msgid "<emph>Filling cells using context menus:</emph>"
msgstr "「<emph>使用右键菜单填充单元格</emph>」:"
-#. hRJz3
+#. 2j5RS
#: 02140000.xhp
msgctxt ""
"02140000.xhp\n"
"par_id3145384\n"
"help.text"
-msgid "Call the <link href=\"text/shared/00/00000005.xhp#kontextmenue\" name=\"context menu\">context menu</link> when positioned in a cell and choose <emph>Selection List</emph>."
-msgstr "定位于单元格中,通过鼠标右键调出<link href=\"text/shared/00/00000005.xhp#kontextmenue\" name=\"context menu\">右键菜单</link>,然后选择「<emph>选择清单</emph>」菜单项。"
+msgid "Call the <link href=\"text/shared/00/00000005.xhp#contextmenu\" name=\"context menu\">context menu</link> when positioned in a cell and choose <emph>Selection List</emph>."
+msgstr ""
#. BzAsX
#: 02140000.xhp
@@ -19492,68 +19492,77 @@ msgctxt ""
msgid "The number 0 is returned for empty cells and matrix elements."
msgstr "对于空单元格和矩阵元素返回数字 0。"
-#. Eg4Cg
+#. frvbX
#: 04060109.xhp
msgctxt ""
"04060109.xhp\n"
"par_idN11827\n"
"help.text"
-msgid "<item type=\"input\">=HYPERLINK(\"http://www.example.org\")</item> displays the text \"http://www.example.org\" in the cell and executes the hyperlink http://www.example.org when clicked."
-msgstr "「<item type=\"input\">=HYPERLINK(\"http://www.example.org\")</item>」在单元格中显示文本 \"http://www.example.org\",并在点击后执行超链接 \"http://www.example.org\"。"
+msgid "<input>=HYPERLINK(\"http://www.example.org\")</input> displays the text \"http://www.example.org\" in the cell and executes the hyperlink http://www.example.org when clicked."
+msgstr ""
-#. GThdD
+#. wHG7A
#: 04060109.xhp
msgctxt ""
"04060109.xhp\n"
"par_idN1182A\n"
"help.text"
-msgid "<item type=\"input\">=HYPERLINK(\"http://www.example.org\";\"Click here\")</item> displays the text \"Click here\" in the cell and executes the hyperlink http://www.example.org when clicked."
-msgstr "「<item type=\"input\">=HYPERLINK(\"http://www.example.org\";\"点击此处\")</item>」在单元格中显示文本 \"点击此处\",并在点击后执行超链接 \"http://www.example.org\"。"
+msgid "<input>=HYPERLINK(\"http://www.example.org\";\"Click here\")</input> displays the text \"Click here\" in the cell and executes the hyperlink http://www.example.org when clicked."
+msgstr ""
-#. nBEGH
+#. jamR2
#: 04060109.xhp
msgctxt ""
"04060109.xhp\n"
"par_id0907200912224534\n"
"help.text"
-msgid "<item type=\"input\">=HYPERLINK(\"http://www.example.org\";12345)</item> displays the number 12345 and executes the hyperlink http://www.example.org when clicked."
+msgid "<input>=HYPERLINK(\"http://www.example.org\";12345)</input> displays the number 12345 and executes the hyperlink http://www.example.org when clicked."
msgstr ""
-#. GFCwJ
+#. qLdBN
#: 04060109.xhp
msgctxt ""
"04060109.xhp\n"
"par_idN1182D\n"
"help.text"
-msgid "<item type=\"input\">=HYPERLINK($B4)</item> where cell B4 contains <item type=\"input\">http://www.example.org</item>. The function adds http://www.example.org to the URL of the hyperlink cell and returns the same text which is used as formula result."
-msgstr "「<item type=\"input\">=HYPERLINK($B4)</item> 其中单元格 B4 包含<item type=\"input\">http://www.example.org</item>」。该函数将 \"http://www.example.org\" 添加到超链接单元格的 URL,并返回用作公式结果的相同文本。"
+msgid "<input>=HYPERLINK($B4)</input> where cell B4 contains <literal>http://www.example.org</literal>. The function adds http://www.example.org to the URL of the hyperlink cell and returns the same text which is used as formula result."
+msgstr ""
-#. viZae
+#. cWDrv
#: 04060109.xhp
msgctxt ""
"04060109.xhp\n"
"par_idN11830\n"
"help.text"
-msgid "<item type=\"input\">=HYPERLINK(\"http://www.\";\"Click \") & \"example.org\"</item> displays the text Click example.org in the cell and executes the hyperlink http://www.example.org when clicked."
-msgstr "「<item type=\"input\">=HYPERLINK(\"http://www.\";\"点击 \") & \"example.org\"</item>」在单元格中显示文本「点击 example.org」,并在点击后执行超链接 http://www.example.org。"
+msgid "<input>=HYPERLINK(\"http://www.\";\"Click \") & \"example.org\"</input> displays the text Click example.org in the cell and executes the hyperlink http://www.example.org when clicked."
+msgstr ""
-#. bdxGj
+#. DDEtK
#: 04060109.xhp
msgctxt ""
"04060109.xhp\n"
"par_id8859523\n"
"help.text"
-msgid "<item type=\"input\">=HYPERLINK(\"#Sheet1.A1\";\"Go to top\")</item> displays the text Go to top and jumps to cell Sheet1.A1 in this document."
-msgstr "「<item type=\"input\">=HYPERLINK(\"#Sheet1.A1\";\"跳至顶部\")</item>」显示文字「跳至顶部」,并跳转到此文档的工作表 1 中的单元格 A1。"
+msgid "<input>=HYPERLINK(\"#Sheet1.A1\";\"Go to top\")</input> displays the text Go to top and jumps to cell Sheet1.A1 in this document."
+msgstr ""
-#. kFDkB
+#. CoMEq
#: 04060109.xhp
msgctxt ""
"04060109.xhp\n"
"par_id2958769\n"
"help.text"
-msgid "<item type=\"input\">=HYPERLINK(\"file:///C:/writer.odt#Specification\";\"Go to Writer bookmark\")</item> displays the text \"Go to Writer bookmark\", loads the specified text document and jumps to bookmark \"Specification\"."
-msgstr "「<item type=\"input\">=HYPERLINK(\"file:///C:/writer.odt#Specification\";\"跳至 Writer 书签\")</item>」显示文本「跳至 Writer 书签」,载入指定的文本文档,并跳转到书签「Specification」。"
+msgid "<input>=HYPERLINK(\"file:///C:/writer.odt#Specification\";\"Go to Writer bookmark\")</input> displays the text \"Go to Writer bookmark\", loads the specified text document and jumps to bookmark \"Specification\"."
+msgstr ""
+
+#. Ky2xV
+#: 04060109.xhp
+msgctxt ""
+"04060109.xhp\n"
+"par_id321615667588042\n"
+"help.text"
+msgid "<input>=HYPERLINK(\"file:///C:/Documents/\";\"Open Documents folder\")</input> displays the text \"Open Documents folder\" and shows the folder contents using the standard file manager in your operating system."
+msgstr ""
#. ubKsF
#: 04060109.xhp
@@ -45718,14 +45727,14 @@ msgctxt ""
msgid "<ahelp hid=\"SFX2_HID_TEMPLATE_FMT\">Displays the list of the styles from the selected style category.</ahelp>"
msgstr "<ahelp hid=\"SFX2_HID_TEMPLATE_FMT\">显示选中样式类别中样式的列表。</ahelp>"
-#. xvaTV
+#. YBufY
#: 05100000.xhp
msgctxt ""
"05100000.xhp\n"
"par_idN109D1\n"
"help.text"
-msgid "In the <link href=\"text/shared/00/00000005.xhp#kontextmenue\" name=\"context menu\">context menu</link> you can choose commands to create a new style, delete a user-defined style, or change the selected style."
-msgstr "在<link href=\"text/shared/00/00000005.xhp#kontextmenue\" name=\"右键菜单\">右键菜单</link>中,您可以选择命令以新建样式、删除自定义样式或修改选中的样式。"
+msgid "In the <link href=\"text/shared/00/00000005.xhp#contextmenu\" name=\"context menu\">context menu</link> you can choose commands to create a new style, delete a user-defined style, or change the selected style."
+msgstr ""
#. zdEoY
#: 05100000.xhp
@@ -63259,23 +63268,23 @@ msgctxt ""
msgid "If there are less delimiters than strings to be joined, the delimiters will be used again from the start."
msgstr "如果分隔符的数量少于字符串的数量,分隔符用完时会从头开始再用一遍。"
-#. 4Zi8d
+#. QaJCw
#: func_textjoin.xhp
msgctxt ""
"func_textjoin.xhp\n"
"par_id441556229012536\n"
"help.text"
-msgid "<input>=TEXTJOIN(\" \",TRUE, \"Here\", \"comes\", \"the\", \"sun\")</input> returns \"Here comes the sun\" with space character as delimiter and empty strings are ignored."
-msgstr "<input>=TEXTJOIN(\" \",TRUE, \"太阳\", \"出\", \"来\", \"了\")</input> 返回「太阳 出 来 了」,空格作为分隔符,且忽略空字符串。"
+msgid "<input>=TEXTJOIN(\" \"; 1; \"Here\"; \"comes\"; \"the\"; \"sun\")</input> returns \"Here comes the sun\" with space character as delimiter and empty strings are ignored."
+msgstr ""
-#. SamHC
+#. 39FPP
#: func_textjoin.xhp
msgctxt ""
"func_textjoin.xhp\n"
"par_id441556239012536\n"
"help.text"
-msgid "if A1:B2 contains \"Here\", \"comes\", \"the\", \"sun\" respectively, <input>=TEXTJOIN(\"-\",TRUE,A1:B2)</input> returns \"Here-comes-the-sun\" with dash character as delimiter and empty strings are ignored."
-msgstr "如果 A1:B2 分别包含 \"太阳\", \"出\", \"来\", \"了\",<input>=TEXTJOIN(\"-\",TRUE,A1:B2)</input> 将返回「太阳-出-来-了」,短横线作为分隔符,且忽略空字符串。"
+msgid "if A1:B2 contains \"Here\", \"comes\", \"the\", \"sun\" respectively, <input>=TEXTJOIN(\"-\";1;A1:B2)</input> returns \"Here-comes-the-sun\" with dash character as delimiter and empty strings are ignored."
+msgstr ""
#. AXCJg
#: func_textjoin.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/sdatabase.po b/source/zh-CN/helpcontent2/source/text/sdatabase.po
index 58414d54c39..ecf09601b1b 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-02-05 18:59+0100\n"
+"POT-Creation-Date: 2021-03-08 14:39+0100\n"
"PO-Revision-Date: 2020-06-14 12:45+0000\n"
"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
"Language-Team: Chinese (Simplified) <https://weblate.documentfoundation.org/projects/libo_help-master/textsdatabase/zh_Hans/>\n"
@@ -3039,13 +3039,13 @@ msgctxt ""
msgid "<link href=\"text/shared/main0212.xhp\" name=\"Sort and Filter Data\">Sort and Filter Data</link>"
msgstr ""
-#. ZEwwQ
+#. hNfEL
#: 05000000.xhp
msgctxt ""
"05000000.xhp\n"
"hd_id3154288\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/05020000.xhp\" name=\"Relations, Primary and External Key\">Relations, Primary and External Key</link>"
+msgid "<link href=\"text/sdatabase/05020000.xhp\" name=\"Relations, Primary and External Key\">Relations, Primary and External Key</link>"
msgstr ""
#. fAyEi
@@ -3795,6 +3795,465 @@ msgctxt ""
msgid "<ahelp hid=\"dbaccess/ui/indexdesigndialog/close\">Closes the dialog.</ahelp>"
msgstr ""
+#. n4gFz
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"tit\n"
+"help.text"
+msgid "Relations"
+msgstr ""
+
+#. sQwNc
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"hd_id3153323\n"
+"help.text"
+msgid "<link href=\"text/sdatabase/05020000.xhp\" name=\"Relations\">Relations</link>"
+msgstr ""
+
+#. GxBiD
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"bm_id3146957\n"
+"help.text"
+msgid "<bookmark_value>relational databases (Base)</bookmark_value>"
+msgstr ""
+
+#. YYXkm
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"par_id3146957\n"
+"help.text"
+msgid "This command opens the <emph>Relation Design </emph>window, which allows you to define relationships between various database tables."
+msgstr ""
+
+#. vMuED
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"par_id3154823\n"
+"help.text"
+msgid "<ahelp hid=\"HID_CTL_RELATIONTAB\">Here you can link together tables from the current database through common data fields.</ahelp> Click the <emph>New Relation</emph> icon to create the relationships, or simply drag-and-drop with the mouse."
+msgstr ""
+
+#. zHWMJ
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"par_id3145316\n"
+"help.text"
+msgid "This function is only available if you are working with a relational database."
+msgstr ""
+
+#. 5MXvo
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"par_id3149235\n"
+"help.text"
+msgid "When you choose <emph>Tools - Relationships</emph>, a window opens in which all the existing relationships between the tables of the current database are shown. If no relationships have been defined, or if you want to relate other tables of the database to each other, then click on the <emph>Add Tables</emph> icon. The <link href=\"text/shared/02/14020100.xhp\" name=\"Add Tables\">Add Tables</link> dialog opens in which you can select the tables with which to create a relation."
+msgstr ""
+
+#. krxTw
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"par_id3152812\n"
+"help.text"
+msgid "If the <emph>Relation Design</emph> window is open, the selected tables cannot be modified, even in Table Design mode. This ensures that tables are not changed while the relations are being created."
+msgstr ""
+
+#. zZFEP
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"par_id3150541\n"
+"help.text"
+msgid "The selected tables are shown in the top area of the relation design view. You can close a table window through the context menu or with the Delete key."
+msgstr ""
+
+#. uJVYH
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"bm_id3148922\n"
+"help.text"
+msgid "<bookmark_value>primary keys;inserting (Base)</bookmark_value><bookmark_value>keys;primary keys (Base)</bookmark_value><bookmark_value>external keys (Base)</bookmark_value>"
+msgstr ""
+
+#. ek2aE
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"hd_id3148922\n"
+"help.text"
+msgid "Primary key and foreign keys"
+msgstr ""
+
+#. ksuDX
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"par_id3149168\n"
+"help.text"
+msgid "If you want to define a relation among the various tables, you should enter a <link href=\"text/shared/00/00000005.xhp#primaerschluessel\" name=\"primary key\">primary key</link> that uniquely identifies a data field of an existing table. You can refer to the primary key from other tables to access the data of this table. All data fields referring to this primary key will be identified as a foreign key."
+msgstr ""
+
+#. FACvb
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"par_id3147085\n"
+"help.text"
+msgid "All data fields referring to a primary key will be identified in the table window by a small key symbol."
+msgstr ""
+
+#. vro8F
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"hd_id3153193\n"
+"help.text"
+msgid "Define relations"
+msgstr ""
+
+#. wmwWU
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"bm_id3155430\n"
+"help.text"
+msgid "<bookmark_value>relations; creating and deleting (Base)</bookmark_value>"
+msgstr ""
+
+#. pGNLA
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"par_id3155430\n"
+"help.text"
+msgid "All existing relations are shown in the relations windows by a line that connects the primary and foreign key fields. You can add a relation by using drag-and-drop to drop the field of one table onto the field of the other table. A relation is removed again by selecting it and pressing the Delete key."
+msgstr ""
+
+#. EF2rg
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"par_id3149984\n"
+"help.text"
+msgid "Alternatively, you can also click the <emph>New Relation</emph> icon in the top area of the relation field and define the relation between two tables in the <link href=\"text/sdatabase/05020100.xhp\" name=\"Relations\"><emph>Relations</emph></link> dialog."
+msgstr ""
+
+#. yTadX
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"par_id3153093\n"
+"help.text"
+msgid "If you use $[officename] as the front-end for a relational database, the creation and deletion of relationships is not placed in an intermediate memory by $[officename], but is forwarded directly to the database."
+msgstr ""
+
+#. bnCjW
+#: 05020000.xhp
+msgctxt ""
+"05020000.xhp\n"
+"par_id3155856\n"
+"help.text"
+msgid "By double-clicking a connection line, you can assign certain properties to the relation. The <emph>Relations </emph>dialog opens."
+msgstr ""
+
+#. zaiku
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"tit\n"
+"help.text"
+msgid "Relations"
+msgstr ""
+
+#. BAAZE
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"bm_id3150499\n"
+"help.text"
+msgid "<bookmark_value>relations; properties (Base)</bookmark_value><bookmark_value>key fields for relations (Base)</bookmark_value><bookmark_value>cascading update (Base)</bookmark_value>"
+msgstr ""
+
+#. tDgC3
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"hd_id3150445\n"
+"help.text"
+msgid "Relations"
+msgstr ""
+
+#. 5fAEp
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3150499\n"
+"help.text"
+msgid "<ahelp hid=\".uno:DBAddRelation\">Allows you to define and edit a relation between two tables.</ahelp>"
+msgstr ""
+
+#. yHc9N
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3155136\n"
+"help.text"
+msgid "The update and delete options are only available if they are supported by the database used."
+msgstr ""
+
+#. BDC5P
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"hd_id3155341\n"
+"help.text"
+msgid "Tables"
+msgstr ""
+
+#. BAGsd
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3153880\n"
+"help.text"
+msgid "<ahelp hid=\"dbaccess/ui/relationdialog/table2\" visibility=\"hidden\">This is where the two related tables are listed.</ahelp> If you create a new relation, you can select one table from each of the combo boxes in the top part of the dialog."
+msgstr ""
+
+#. 4UCC7
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3154047\n"
+"help.text"
+msgid "If you opened the <emph>Relations</emph> dialog for an existing relation by double-clicking the connection lines in the Relation window, then the tables involved in the relation cannot be modified."
+msgstr ""
+
+#. VBeNf
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"hd_id3153822\n"
+"help.text"
+msgid "Key fields"
+msgstr ""
+
+#. CnkB6
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3159157\n"
+"help.text"
+msgid "<ahelp hid=\"dbaccess/ui/joindialog/relations\">Defines the key fields for the relation.</ahelp>"
+msgstr ""
+
+#. tG7Wy
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3149235\n"
+"help.text"
+msgid "<ahelp hid=\"dbaccess/ui/relationdialog/table2\">The names of the tables selected for the link appear here as column names.</ahelp> If you click a field, you can use the arrow buttons to select a field from the table. Each relation is written in a row."
+msgstr ""
+
+#. ECqps
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"hd_id3145609\n"
+"help.text"
+msgid "Update options"
+msgstr ""
+
+#. TcZQE
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3153061\n"
+"help.text"
+msgid "Here you can select options that take effect when there are changes to a primary key field."
+msgstr ""
+
+#. SNgAC
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"hd_id3149046\n"
+"help.text"
+msgid "No action"
+msgstr ""
+
+#. BQgh9
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3152360\n"
+"help.text"
+msgid "<ahelp hid=\"dbaccess/ui/relationdialog/addaction\">Specifies that any change made to a primary key does not affect other external key fields.</ahelp>"
+msgstr ""
+
+#. UzK5q
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"hd_id3148664\n"
+"help.text"
+msgid "Updating cascade"
+msgstr ""
+
+#. GFtru
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3154073\n"
+"help.text"
+msgid "<ahelp hid=\"dbaccess/ui/relationdialog/addcascade\">Updates all the external key fields if the value of the corresponding primary key has been modified (Cascading Update).</ahelp>"
+msgstr ""
+
+#. xydLE
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"hd_id3145171\n"
+"help.text"
+msgid "Set null"
+msgstr ""
+
+#. ksYnw
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3154123\n"
+"help.text"
+msgid "<ahelp hid=\"dbaccess/ui/relationdialog/addnull\"> If the corresponding primary key has been modified, use this option to set the \"IS NULL\" value to all external key fields. IS NULL means that the field is empty.</ahelp>"
+msgstr ""
+
+#. FGxMC
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"hd_id3150448\n"
+"help.text"
+msgid "Set default"
+msgstr ""
+
+#. T7dEQ
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3151041\n"
+"help.text"
+msgid "<ahelp hid=\"dbaccess/ui/relationdialog/adddefault\"> If the corresponding primary key has been modified, use this option to set a default value to all external key fields.</ahelp> During the creation of the corresponding table, the default value of an external key field will be defined when you assign the field properties."
+msgstr ""
+
+#. AvWBL
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"hd_id3125863\n"
+"help.text"
+msgid "Delete options"
+msgstr ""
+
+#. ayyns
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3153193\n"
+"help.text"
+msgid "Here you can select options that take effect when a primary key field is deleted."
+msgstr ""
+
+#. jTCSL
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"hd_id3159252\n"
+"help.text"
+msgid "No action"
+msgstr ""
+
+#. PgDqt
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3145785\n"
+"help.text"
+msgid "<ahelp hid=\"dbaccess/ui/relationdialog/delaction\">Specifies that the deletion of a primary key will not have any effect on other external key fields.</ahelp>"
+msgstr ""
+
+#. hFmB4
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"hd_id3154146\n"
+"help.text"
+msgid "Delete cascade"
+msgstr ""
+
+#. ESpAp
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3155309\n"
+"help.text"
+msgid "<ahelp hid=\"dbaccess/ui/relationdialog/delcascade\">Specifies that all external key fields will be deleted if you delete the corresponding primary key field.</ahelp>"
+msgstr ""
+
+#. ZaNTh
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3153140\n"
+"help.text"
+msgid "When you delete a primary key field with the<emph> Delete cascade </emph>option, all records from other tables that have this key as their foreign key are also deleted. Use this option with great care; it is possible that a major portion of the database can be deleted."
+msgstr ""
+
+#. mAu9C
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"hd_id3152596\n"
+"help.text"
+msgid "Set null"
+msgstr ""
+
+#. dAtCx
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3153363\n"
+"help.text"
+msgid "<ahelp hid=\"dbaccess/ui/relationdialog/delnull\">If you delete the corresponding primary key, the \"IS NULL\" value will be assigned to all external key fields.</ahelp>"
+msgstr ""
+
+#. 474LG
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"hd_id3145272\n"
+"help.text"
+msgid "Set Default"
+msgstr ""
+
+#. ktJ6K
+#: 05020100.xhp
+msgctxt ""
+"05020100.xhp\n"
+"par_id3154320\n"
+"help.text"
+msgid "<ahelp hid=\"dbaccess/ui/relationdialog/deldefault\">If you delete the corresponding primary key, a set value will be set to all external key fields.</ahelp>"
+msgstr ""
+
#. cLmBi
#: main.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/shared/00.po b/source/zh-CN/helpcontent2/source/text/shared/00.po
index 68dee15a74c..5d155c6d839 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/00.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/00.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-02-22 17:17+0100\n"
+"POT-Creation-Date: 2021-03-22 13:58+0100\n"
"PO-Revision-Date: 2019-07-10 03:06+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -601,14 +601,14 @@ msgctxt ""
msgid "<variable id=\"wahr\">If an error occurs, the function returns a logical or numerical value.</variable>"
msgstr "<variable id=\"wahr\">如果发生错误,此函数将返回一个逻辑值或数字值。</variable>"
-#. oSC8p
+#. ECspB
#: 00000001.xhp
msgctxt ""
"00000001.xhp\n"
"par_id3154145\n"
"help.text"
-msgid "<variable id=\"kontext\">(This command is only accessible through the <link href=\"text/shared/00/00000005.xhp#kontextmenue\" name=\"context menu\">context menu</link>).</variable>"
-msgstr "<variable id=\"kontext\">(此命令仅能通过<link href=\"text/shared/00/00000005.xhp#kontextmenue\" name=\"右键菜单\">右键菜单</link>)访问。</variable>"
+msgid "<variable id=\"kontext\">(This command is only accessible through the <link href=\"text/shared/00/00000005.xhp#contextmenu\" name=\"context menu\">context menu</link>).</variable>"
+msgstr ""
#. JFGU9
#: 00000001.xhp
@@ -2122,15 +2122,6 @@ msgctxt ""
msgid "Enable CTL support using <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Language Settings - Languages</menuitem>."
msgstr ""
-#. AP8vJ
-#: 00000005.xhp
-msgctxt ""
-"00000005.xhp\n"
-"par_idN108F1\n"
-"help.text"
-msgid "Context Menu"
-msgstr "右键菜单"
-
#. hfzNy
#: 00000005.xhp
msgctxt ""
@@ -7936,6 +7927,15 @@ msgctxt ""
msgid "Image"
msgstr "图像"
+#. 8ceGP
+#: 00000404.xhp
+msgctxt ""
+"00000404.xhp\n"
+"par_id671614345792991\n"
+"help.text"
+msgid "Choose <menuitem>Insert - Frame - Floating Frame</menuitem>"
+msgstr ""
+
#. yAVgx
#: 00000404.xhp
msgctxt ""
@@ -7954,14 +7954,14 @@ msgctxt ""
msgid "On the <emph>Insert</emph> bar, click"
msgstr "在「<emph>插入</emph>」栏上,点击"
-#. 5CBGw
+#. SEYKo
#: 00000404.xhp
msgctxt ""
"00000404.xhp\n"
"par_id3168607\n"
"help.text"
-msgid "<image id=\"img_id3147482\" src=\"cmd/sc_insertobjectfloatingframe.png\" width=\"0.222inch\" height=\"0.222inch\"><alt id=\"alt_id3147482\">Icon</alt></image>"
-msgstr "<image id=\"img_id3147482\" src=\"cmd/sc_insertobjectfloatingframe.png\" width=\"0.222inch\" height=\"0.222inch\"><alt id=\"alt_id3147482\">图标</alt></image>"
+msgid "<image id=\"img_id3147482\" src=\"cmd/sc_insertobjectfloatingframe.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3147482\">Icon</alt></image>"
+msgstr ""
#. 6RNey
#: 00000404.xhp
@@ -8125,13 +8125,13 @@ msgctxt ""
msgid "Stars"
msgstr "星形"
-#. c6VE3
+#. GCpBe
#: 00000404.xhp
msgctxt ""
"00000404.xhp\n"
"par_id81526422144005\n"
"help.text"
-msgid "Choose <emph>Insert - Signature Line...</emph>"
+msgid "Choose <emph>Insert - Signature Line</emph>"
msgstr ""
#. aFWLc
@@ -10654,6 +10654,15 @@ msgctxt ""
msgid "Choose <emph>Format - Bullets and Numbering</emph>."
msgstr "选择「<emph>格式 - 项目符号与编号</emph>」。"
+#. GmdFv
+#: 00040500.xhp
+msgctxt ""
+"00040500.xhp\n"
+"par_id761616160771224\n"
+"help.text"
+msgid "Right-click a paragraph, choose <menuitem>List - Bullets and Numbering</menuitem>."
+msgstr ""
+
#. N8NwQ
#: 00040500.xhp
msgctxt ""
@@ -10663,23 +10672,23 @@ msgctxt ""
msgid "On <emph>Formatting</emph> bar, click"
msgstr "在「<emph>格式</emph>」工具栏中,点击"
-#. 4QWK9
+#. sQFWD
#: 00040500.xhp
msgctxt ""
"00040500.xhp\n"
"par_id3149445\n"
"help.text"
-msgid "<image id=\"img_id3149964\" src=\"cmd/sc_defaultbullet.svg\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3149964\">Icon bullet list</alt></image>"
+msgid "<image id=\"img_id3149964\" src=\"cmd/lc_bulletsandnumberingdialog.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3149964\">Bullets and Numbering dialog Icon</alt></image>"
msgstr ""
-#. yavcV
+#. BPPZD
#: 00040500.xhp
msgctxt ""
"00040500.xhp\n"
"par_id3157970\n"
"help.text"
-msgid "Bullets On/Off"
-msgstr "项目符号打开/关闭"
+msgid "Bullets and Numbering"
+msgstr ""
#. XAbBj
#: 00040500.xhp
@@ -10735,40 +10744,40 @@ msgctxt ""
msgid "Open <emph>Styles - List Styles</emph> - context menu of an entry - choose <emph>New/Modify</emph>."
msgstr ""
-#. ZD5up
+#. n79tw
#: 00040500.xhp
msgctxt ""
"00040500.xhp\n"
"par_id3156011\n"
"help.text"
-msgid "Choose <menuitem>View - Styles</menuitem> (F11) - context menu of a Presentation Style (except Background) - choose <menuitem>New/Modify - Numbering</menuitem> tab."
+msgid "Choose <menuitem>View - Styles</menuitem> (<switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline>) - context menu of a Presentation Style (except Background) - choose <menuitem>New/Modify - Numbering</menuitem> tab."
msgstr ""
-#. 3g7gB
+#. tbLJG
#: 00040500.xhp
msgctxt ""
"00040500.xhp\n"
"par_id3150862\n"
"help.text"
-msgid "Choose <menuitem>Format - Bullets and Numbering - Numbering</menuitem> tab."
+msgid "Choose <menuitem>Format - Bullets and Numbering - Ordered</menuitem> tab."
msgstr ""
-#. iTevh
+#. Rak4H
#: 00040500.xhp
msgctxt ""
"00040500.xhp\n"
"par_id3129011\n"
"help.text"
-msgid "Choose <menuitem>View - Styles</menuitem> (F11) - context menu of a List Style - choose <menuitem>New/Modify - Numbering Style</menuitem> tab."
+msgid "Choose <menuitem>View - Styles</menuitem> (<switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline>) - context menu of a List Style - choose <menuitem>New/Modify - Ordered</menuitem> tab."
msgstr ""
-#. dAnx5
+#. 2XAFx
#: 00040500.xhp
msgctxt ""
"00040500.xhp\n"
"par_id3146019\n"
"help.text"
-msgid "Choose <menuitem>Styles - Manage Styles</menuitem> - choose - context menu of a List Style - choose <menuitem>New/Modify - Numbering Style</menuitem> tab."
+msgid "Choose <menuitem>Styles - Manage Styles</menuitem> - context menu of a List Style - choose <menuitem>New/Modify - Ordered</menuitem> tab."
msgstr ""
#. 4AKhs
@@ -10780,49 +10789,40 @@ msgctxt ""
msgid "<variable id=\"graphics\">Choose <emph>Format - Bullets and Numbering - Image</emph> tab.</variable>"
msgstr "<variable id=\"graphics\">选择「<emph>格式 - 项目符号与编号 - 图像</emph>」选项卡。</variable>"
-#. G4FjC
+#. CwE3e
#: 00040500.xhp
msgctxt ""
"00040500.xhp\n"
"par_id3155848\n"
"help.text"
-msgid "Choose <emph>Format - Bullets and Numbering - Outline</emph> tab."
-msgstr "选择「<emph>格式 - 项目符号与编号 - 大纲</emph>」选项卡。"
+msgid "Choose <menuitem>Format - Bullets and Numbering - Outline</menuitem> tab."
+msgstr ""
-#. ifngA
+#. 8cr6F
#: 00040500.xhp
msgctxt ""
"00040500.xhp\n"
"par_id3148733\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Open <emph>Styles - List Styles</emph> - context menu of an entry - choose <emph>New/Modify</emph>.</caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\">打开「<emph>样式 - 列表样式</emph> - 某个条目的右键菜单 - 选择<emph>新建/修改</emph>」。</caseinline></switchinline>"
-
-#. BQqBM
-#: 00040500.xhp
-msgctxt ""
-"00040500.xhp\n"
-"par_id3154931\n"
-"help.text"
-msgid "Open <emph>Styles - List Styles</emph> - context menu of an entry - choose <emph>New/Modify</emph>."
+msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Choose <menuitem>Styles - Manage Styles</menuitem> (<switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline>) - context menu of a List Style entry - choose <emph>New/Modify</emph>.</caseinline></switchinline>"
msgstr ""
-#. TDV7t
+#. gfMdA
#: 00040500.xhp
msgctxt ""
"00040500.xhp\n"
-"par_id3153812\n"
+"par_id3156658\n"
"help.text"
-msgid "Choose <menuitem>View - Styles</menuitem> (F11) - choose List Styles - context menu of an entry - choose <menuitem>New/Modify</menuitem> - <emph>Position</emph> tab."
+msgid "Choose <menuitem>Format - Bullets and Numbering</menuitem> - <emph>Position</emph> tab."
msgstr ""
-#. gfMdA
+#. DVZRw
#: 00040500.xhp
msgctxt ""
"00040500.xhp\n"
-"par_id3156658\n"
+"par_id3153812\n"
"help.text"
-msgid "Choose <menuitem>Format - Bullets and Numbering</menuitem> - <emph>Position</emph> tab."
+msgid "Choose <menuitem>View - Styles</menuitem> (<switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline>) - choose List Styles - context menu of an entry - choose <menuitem>New/Modify</menuitem> - <emph>Position</emph> tab."
msgstr ""
#. t8uTF
@@ -12535,13 +12535,13 @@ msgctxt ""
msgid "Choose <menuitem>Format - Area - Transparency</menuitem> tab (drawing documents)."
msgstr ""
-#. ABvKj
+#. 3GEwT
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
"par_id3145365\n"
"help.text"
-msgid "Choose <menuitem>Format - Area - Transparency</menuitem> tab (presentation documents)."
+msgid "Choose <menuitem>Format - Object and Shape - Area - Transparency</menuitem> tab (presentation documents)."
msgstr ""
#. KXq32
@@ -13093,49 +13093,49 @@ msgctxt ""
msgid "Open context menu - choose <menuitem>Style - Subscript</menuitem>."
msgstr ""
-#. ATNzQ
+#. GCxvv
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
"par_id3155377\n"
"help.text"
-msgid "Open context menu - choose <menuitem>Line Spacing</menuitem>."
+msgid "Choose <menuitem>Format - Spacing</menuitem>."
msgstr ""
-#. zWwjF
+#. AJWAM
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
"par_id3154475\n"
"help.text"
-msgid "Open context menu - choose <menuitem>Line Spacing - Single</menuitem>."
+msgid "Choose <menuitem>Format - Spacing - Line Spacing: 1</menuitem>."
msgstr ""
-#. GdBSL
+#. TKPgq
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
"par_id3150478\n"
"help.text"
-msgid "Open context menu - choose <menuitem>Line Spacing - 1.5 Lines</menuitem>."
+msgid "Choose <menuitem>Format - Spacing - Line Spacing: 1.5</menuitem>."
msgstr ""
-#. pNDFU
+#. nxrCX
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
"par_id3147167\n"
"help.text"
-msgid "Open context menu - choose <menuitem>Line Spacing - Double</menuitem>."
+msgid "Choose <menuitem>Format - Spacing - Line Spacing: 2</menuitem>."
msgstr ""
-#. 4TwEA
+#. eLguF
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
"par_id3146978\n"
"help.text"
-msgid "Choose <menuitem>Format - Align - Left</menuitem> (drawing functions)."
+msgid "Choose <menuitem>Format - Align Text - Left</menuitem>."
msgstr ""
#. reirq
@@ -13165,13 +13165,13 @@ msgctxt ""
msgid "Align Left"
msgstr "左对齐"
-#. 4wBza
+#. mmjN6
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
"par_id3155823\n"
"help.text"
-msgid "Choose <menuitem>Format - Align - Right</menuitem> (drawing functions)."
+msgid "Choose <menuitem>Format - Align Text - Right</menuitem>."
msgstr ""
#. 2MorN
@@ -13201,13 +13201,13 @@ msgctxt ""
msgid "Align Right"
msgstr "右对齐"
-#. ZvaaQ
+#. QVuAL
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
"par_id3149189\n"
"help.text"
-msgid "Choose <menuitem>Format - Align - Centered</menuitem> (drawing functions)."
+msgid "Choose <menuitem>Format - Align Text - Centered</menuitem>."
msgstr ""
#. YutM3
@@ -13237,13 +13237,13 @@ msgctxt ""
msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Align Center Horizontally</caseinline><defaultinline>Centered</defaultinline></switchinline>"
msgstr "<switchinline select=\"appl\"><caseinline select=\"CALC\">水平居中对齐</caseinline><defaultinline>居中</defaultinline></switchinline>"
-#. FiPMC
+#. BAFc3
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
"par_id3146151\n"
"help.text"
-msgid "Choose <menuitem>Format - Align - Justified</menuitem> (drawing functions)."
+msgid "Choose <menuitem>Format - Align Text - Justified</menuitem>."
msgstr ""
#. Mj8VD
@@ -13300,31 +13300,31 @@ msgctxt ""
msgid "Open context menu - choose <menuitem>Group</menuitem>."
msgstr ""
-#. 3AJkC
+#. 93FXg
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
-"par_id3157985\n"
+"par_id3157980\n"
"help.text"
-msgid "Choose <menuitem>Format - Group - Group</menuitem> (text documents, spreadsheets)."
+msgid "Choose <menuitem>Shape - Group - Group</menuitem>"
msgstr ""
-#. bdCDb
+#. dXNCq
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
-"par_id3157980\n"
+"par_id3157985\n"
"help.text"
-msgid "Choose <menuitem>Shape - Group - Group</menuitem> (drawing documents)."
+msgid "Choose <menuitem>Format - Group - Group</menuitem>"
msgstr ""
-#. RvPBU
+#. w3EVK
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
"par_id3149508\n"
"help.text"
-msgid "Open context menu - choose <menuitem>Group - Group</menuitem> (form objects)."
+msgid "Open context menu - choose <menuitem>Group</menuitem> (for text box and shapes)."
msgstr ""
#. ibZAV
@@ -13345,22 +13345,22 @@ msgctxt ""
msgid "Group"
msgstr "组合"
-#. GuQA3
+#. fQM7Y
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
-"par_id3153023\n"
+"par_id3163378\n"
"help.text"
-msgid "Choose <menuitem>Format - Group - Ungroup</menuitem> (text documents, spreadsheets)."
+msgid "Choose <menuitem>Shape - Group - Ungroup</menuitem>."
msgstr ""
-#. WFDj3
+#. K7UZY
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
-"par_id3163378\n"
+"par_id3153023\n"
"help.text"
-msgid "Choose <menuitem>Shape - Group - Ungroup</menuitem> (drawing documents)."
+msgid "Choose <menuitem>Format - Group - Ungroup</menuitem>."
msgstr ""
#. 9k3ef
@@ -13390,22 +13390,22 @@ msgctxt ""
msgid "Ungroup"
msgstr "取消组合"
-#. cdsaS
+#. kPkDt
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
-"par_id3153109\n"
+"par_id3145678\n"
"help.text"
-msgid "Choose <menuitem>Format - Group - Exit Group</menuitem> (text documents, spreadsheets)."
+msgid "Choose <menuitem>Shape - Group - Exit Group</menuitem>."
msgstr ""
-#. P2Xae
+#. fZQDA
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
-"par_id3145678\n"
+"par_id3153109\n"
"help.text"
-msgid "Choose <menuitem>Shape - Group - Exit Group</menuitem> (drawing documents)."
+msgid "Choose <menuitem>Format - Group - Exit Group</menuitem>."
msgstr ""
#. Bszjv
@@ -13435,22 +13435,22 @@ msgctxt ""
msgid "Exit Group"
msgstr "退出组合"
-#. Cx3Zj
+#. iWdD3
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
-"par_id3149129\n"
+"par_id3145354\n"
"help.text"
-msgid "Choose <menuitem>Format - Group - Enter Group</menuitem> (text documents, spreadsheets)."
+msgid "Choose <menuitem>Shape - Group - Enter Group</menuitem>."
msgstr ""
-#. hn7Hv
+#. vuF7P
#: 00040502.xhp
msgctxt ""
"00040502.xhp\n"
-"par_id3145354\n"
+"par_id3149129\n"
"help.text"
-msgid "Choose <menuitem>Shape - Group - Enter Group</menuitem> (drawing documents)."
+msgid "Choose <menuitem>Format - Group - Enter Group</menuitem>."
msgstr ""
#. 4rTmw
diff --git a/source/zh-CN/helpcontent2/source/text/shared/01.po b/source/zh-CN/helpcontent2/source/text/shared/01.po
index b8d210880ea..c5f654db528 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/01.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/01.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-02-17 15:58+0100\n"
+"POT-Creation-Date: 2021-03-23 11:44+0100\n"
"PO-Revision-Date: 2021-01-13 13:36+0000\n"
"Last-Translator: Petro Ding <petroenk@outlook.com>\n"
"Language-Team: Chinese (Simplified) <https://translations.documentfoundation.org/projects/libo_help-master/textshared01/zh_Hans/>\n"
@@ -3067,14 +3067,14 @@ msgctxt ""
msgid "<bookmark_value>Export as; PDF</bookmark_value><bookmark_value>Export as; EPUB</bookmark_value>"
msgstr "<bookmark_value>导出为; PDF</bookmark_value><bookmark_value>导出为; EPUB</bookmark_value>"
-#. NDQi2
+#. C5uBC
#: 01070002.xhp
msgctxt ""
"01070002.xhp\n"
"hd_id751513634008094\n"
"help.text"
-msgid "<link href=\"text/shared/01/01070002.xhp\" name=\"Export As...\">Export As...</link>"
-msgstr "<link href=\"text/shared/01/01070002.xhp\" name=\"Export As...\">导出为...</link>"
+msgid "<link href=\"text/shared/01/01070002.xhp\" name=\"Export As\">Export As</link>"
+msgstr ""
#. yQFCE
#: 01070002.xhp
@@ -3085,14 +3085,14 @@ msgctxt ""
msgid "<variable id=\"exportas1\"><ahelp hid=\".\">Export the document in PDF or EPUB formats.</ahelp></variable>"
msgstr "<variable id=\"exportas1\"><ahelp hid=\".\">将文档导出为 PDF 或 EPUB 格式。</ahelp></variable>"
-#. 84MXi
+#. MhcED
#: 01070002.xhp
msgctxt ""
"01070002.xhp\n"
"par_id971513634212601\n"
"help.text"
-msgid "Choose <emph>File - Export As...</emph> ."
-msgstr "选择「<emph>文件 - 导出为...</emph>」。"
+msgid "Choose <emph>File - Export As</emph>."
+msgstr ""
#. 5EMoa
#: 01070002.xhp
@@ -5623,14 +5623,14 @@ msgctxt ""
msgid "separated by"
msgstr "分隔方式"
-#. qctV8
+#. MVCUS
#: 01160300.xhp
msgctxt ""
"01160300.xhp\n"
"par_id3156426\n"
"help.text"
-msgid "<ahelp hid=\".\">Select the paragraph style or outline level that you want to use to separate the source document into sub-documents.</ahelp> By default a new document is created for every chapter level 1."
-msgstr "<ahelp hid=\".\">选择用于把源文档分成子文档所使用的段落样式或大纲级别。</ahelp>默认情况下,对于每个章节级别 1 都创建一个新文档。"
+msgid "<ahelp hid=\".\">Select the paragraph style or outline level that you want to use to separate the source document into sub-documents.</ahelp> By default a new document is created for every outline level 1."
+msgstr ""
#. 949cB
#: 01160300.xhp
@@ -14128,6 +14128,24 @@ msgctxt ""
msgid "When you click a character in the <emph>Special Characters</emph> dialog, a preview and the corresponding numerical code for the character is displayed."
msgstr "点击「<emph>特殊字符</emph>」对话框中的某个字符时,将显示该字符的预览以及对应的数字代码。"
+#. AQsdj
+#: 04100000.xhp
+msgctxt ""
+"04100000.xhp\n"
+"hd_id451614794558893\n"
+"help.text"
+msgid "Search"
+msgstr ""
+
+#. JGCeA
+#: 04100000.xhp
+msgctxt ""
+"04100000.xhp\n"
+"par_id741614794572948\n"
+"help.text"
+msgid "Enter the UTF-8 name or part of the name of the character to display the UTF-8 character in the top left square of the grid. The name of the character cannot be translated. For example, enter <literal>tilde</literal> to display <literal>~</literal> and enter <literal>latin capital letter O with circumflex</literal> to display <literal>Ô</literal>."
+msgstr ""
+
#. d8FbY
#: 04100000.xhp
msgctxt ""
@@ -15424,33 +15442,6 @@ msgctxt ""
msgid "<emph>Small capitals</emph> - <variable id=\"smallcapitals\">Changes the selected lowercase characters to uppercase characters, and then reduces their size.</variable>"
msgstr ""
-#. kGuxJ
-#: 05020200.xhp
-msgctxt ""
-"05020200.xhp\n"
-"bm_id410168\n"
-"help.text"
-msgid "<bookmark_value>blinking fonts</bookmark_value> <bookmark_value>flashing fonts</bookmark_value>"
-msgstr "<bookmark_value>闪烁字体</bookmark_value> <bookmark_value>闪烁字体</bookmark_value>"
-
-#. Suvvn
-#: 05020200.xhp
-msgctxt ""
-"05020200.xhp\n"
-"hd_id3152941\n"
-"help.text"
-msgid "Blinking"
-msgstr "闪动"
-
-#. 2FiCB
-#: 05020200.xhp
-msgctxt ""
-"05020200.xhp\n"
-"par_id3145662\n"
-"help.text"
-msgid "<ahelp hid=\"cui/ui/effectspage/blinkingcb\">Makes the selected characters blink. You cannot change the blink frequency.</ahelp>"
-msgstr "<ahelp hid=\"cui/ui/effectspage/blinkingcb\">闪烁选中字符。您不能更改闪烁频率。</ahelp>"
-
#. B3MEb
#: 05020200.xhp
msgctxt ""
@@ -23857,14 +23848,14 @@ msgctxt ""
msgid "<ahelp hid=\"svx/ui/asianphoneticguidedialog/styles\">Opens the <switchinline select=\"appl\"><caseinline select=\"WRITER\"><link href=\"text/swriter/01/05140000.xhp\" name=\"Styles\">Styles deck of the Sidebar</link></caseinline><defaultinline>Styles deck of the Sidebar</defaultinline></switchinline> where you can select a character style for the ruby text.</ahelp>"
msgstr "<ahelp hid=\"svx/ui/asianphoneticguidedialog/styles\">打开<switchinline select=\"appl\"><caseinline select=\"WRITER\"><link href=\"text/swriter/01/05140000.xhp\" name=\"Styles\">「样式」窗口</link></caseinline><defaultinline>「样式」窗口</defaultinline></switchinline>,您可以在该窗口选择注音文字的字符样式。</ahelp>"
-#. aXpX4
+#. MD7GR
#: 05070000.xhp
msgctxt ""
"05070000.xhp\n"
"tit\n"
"help.text"
-msgid "Aligning (Objects)"
-msgstr "对齐 (对象)"
+msgid "Align Objects"
+msgstr ""
#. kVyf4
#: 05070000.xhp
@@ -23875,14 +23866,14 @@ msgctxt ""
msgid "<bookmark_value>aligning; objects</bookmark_value><bookmark_value>positioning; objects</bookmark_value><bookmark_value>ordering; objects</bookmark_value>"
msgstr "<bookmark_value>对齐; 对象</bookmark_value><bookmark_value>定位; 对象</bookmark_value><bookmark_value>排序; 对象</bookmark_value>"
-#. a4NeC
+#. xAmKa
#: 05070000.xhp
msgctxt ""
"05070000.xhp\n"
"hd_id3149987\n"
"help.text"
-msgid "<link href=\"text/shared/01/05070000.xhp\" name=\"Aligning (Objects)\">Alignment (Objects)</link>"
-msgstr "<link href=\"text/shared/01/05070000.xhp\" name=\"对齐 (对象) \">对齐 (对象) </link>"
+msgid "<link href=\"text/shared/01/05070000.xhp\" name=\"Aligning (Objects)\">Align Objects</link>"
+msgstr ""
#. dFAkA
#: 05070000.xhp
@@ -28042,14 +28033,14 @@ msgctxt ""
msgid "<bookmark_value>text; text/draw objects</bookmark_value> <bookmark_value>draw objects; text in</bookmark_value> <bookmark_value>frames; text fitting to frames</bookmark_value>"
msgstr "<bookmark_value>文本; 文本/绘图对象</bookmark_value><bookmark_value>绘图对象; 文本</bookmark_value><bookmark_value>框架; 文本适应框架</bookmark_value>"
-#. awqBc
+#. UEuLi
#: 05220000.xhp
msgctxt ""
"05220000.xhp\n"
"hd_id3146856\n"
"help.text"
-msgid "<link href=\"text/shared/01/05220000.xhp\" name=\"Text\">Text Attributes</link>"
-msgstr ""
+msgid "<link href=\"text/shared/01/05220000.xhp\" name=\"Text\">Text</link>"
+msgstr "<link href=\"text/shared/01/05220000.xhp\" name=\"文字\">文字</link>"
#. cBEMC
#: 05220000.xhp
@@ -34603,14 +34594,14 @@ msgctxt ""
msgid "Text Attributes"
msgstr ""
-#. UEXgE
+#. dZtp3
#: 05990000.xhp
msgctxt ""
"05990000.xhp\n"
"hd_id3155757\n"
"help.text"
-msgid "<link href=\"text/shared/01/05990000.xhp\" name=\"Text\">Text</link>"
-msgstr "<link href=\"text/shared/01/05990000.xhp\" name=\"文字\">文字</link>"
+msgid "<link href=\"text/shared/01/05990000.xhp\" name=\"Text\">Text Attributes</link>"
+msgstr ""
#. B2wiN
#: 05990000.xhp
@@ -37897,14 +37888,14 @@ msgctxt ""
msgid "<link href=\"text/shared/01/06050000.xhp\" name=\"Numbering/Bullets\">Bullets and Numbering</link>"
msgstr "<link href=\"text/shared/01/06050000.xhp\" name=\"编号/项目符号\">编号/项目符号</link>"
-#. sdTwy
+#. S7psX
#: 06050000.xhp
msgctxt ""
"06050000.xhp\n"
"par_id3150146\n"
"help.text"
-msgid "<variable id=\"numauftext\"><ahelp hid=\".\">Adds numbering or bullets to the current paragraph, and lets you edit format of the numbering or bullets.</ahelp></variable>"
-msgstr "<variable id=\"numauftext\"><ahelp hid=\".\">为当前段落添加编号或项目符号,并允许您编辑编号或项目符号的格式。</ahelp></variable>"
+msgid "<variable id=\"numauftext\"><ahelp hid=\".\">Adds numbering or bullets to the current paragraph or to selected paragraphs, and lets you edit format of the numbering or bullets.</ahelp></variable>"
+msgstr ""
#. 7wAZT
#: 06050000.xhp
@@ -37915,15 +37906,6 @@ msgctxt ""
msgid "The <emph>Bullets and Numbering</emph> dialog has the following tabs:"
msgstr "「<emph>项目符号与编号</emph>」对话框含有以下选项卡:"
-#. FXvcQ
-#: 06050000.xhp
-msgctxt ""
-"06050000.xhp\n"
-"hd_id911610939960192\n"
-"help.text"
-msgid "<link href=\"text/shared/01/06050200.xhp\" name=\"Numbering\">Numbering</link>"
-msgstr ""
-
#. FUmyk
#: 06050000.xhp
msgctxt ""
@@ -38086,14 +38068,14 @@ msgctxt ""
msgid "<link href=\"text/shared/01/06050500.xhp\" name=\"Options tab (Numbering/Bullets dialog)\">Customize tab (Bullets and Numbering dialog)</link>"
msgstr ""
-#. mFseS
+#. AQgFB
#: 06050300.xhp
msgctxt ""
"06050300.xhp\n"
"tit\n"
"help.text"
-msgid "Outline"
-msgstr "大纲"
+msgid "Outline (Bullets and Numbering)"
+msgstr ""
#. Tuc3B
#: 06050300.xhp
@@ -38104,14 +38086,14 @@ msgctxt ""
msgid "<link href=\"text/shared/01/06050300.xhp\" name=\"Outline\">Outline</link>"
msgstr "<link href=\"text/shared/01/06050300.xhp\" name=\"大纲\">大纲</link>"
-#. faDgM
+#. 2DJLS
#: 06050300.xhp
msgctxt ""
"06050300.xhp\n"
"par_id3146936\n"
"help.text"
-msgid "<ahelp hid=\".\">Displays the different styles that you can apply to a hierarchical list. $[officename] supports up to nine outline levels in a list hierarchy.</ahelp>"
-msgstr "<ahelp hid=\".\">显示可应用于分层列表的各种样式。$[officename] 在一个列表层次结构中最多支持九级大纲。</ahelp>"
+msgid "<ahelp hid=\".\">Displays the different formats that you can apply to a hierarchical list. $[officename] supports up to nine outline levels in a list hierarchy.</ahelp>"
+msgstr ""
#. RDBrG
#: 06050300.xhp
@@ -38122,14 +38104,14 @@ msgctxt ""
msgid "Selection"
msgstr "选择"
-#. tG9L7
+#. PPdZD
#: 06050300.xhp
msgctxt ""
"06050300.xhp\n"
"par_id3155934\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/pickoutlinepage/valueset\">Click the outline style that you want to use.</ahelp>"
-msgstr "<ahelp hid=\"cui/ui/pickoutlinepage/valueset\">点击要使用的大纲样式。</ahelp>"
+msgid "<ahelp hid=\"cui/ui/pickoutlinepage/valueset\">Click the outline format that you want to use.</ahelp>"
+msgstr ""
#. WYun7
#: 06050300.xhp
@@ -38167,14 +38149,14 @@ msgctxt ""
msgid "<link href=\"text/shared/01/06050400.xhp\" name=\"Graphics\">Image</link>"
msgstr ""
-#. g8rob
+#. YBPGk
#: 06050400.xhp
msgctxt ""
"06050400.xhp\n"
"par_id0611200904373226\n"
"help.text"
-msgid "<ahelp hid=\".\">Displays the different graphics that you can use as bullets in a bulleted list.</ahelp>"
-msgstr "<ahelp hid=\".\">显示可在带有项目符号的列表中用作项目符号的各种图形。</ahelp>"
+msgid "<ahelp hid=\".\">Displays the different graphics that you can use as bullets in an unordered list.</ahelp>"
+msgstr ""
#. yDHf2
#: 06050400.xhp
@@ -38257,14 +38239,14 @@ msgctxt ""
msgid "<link href=\"text/shared/01/06050500.xhp\" name=\"Options\">Customize</link>"
msgstr ""
-#. KTDdy
+#. ptL6S
#: 06050500.xhp
msgctxt ""
"06050500.xhp\n"
"par_id3147212\n"
"help.text"
-msgid "Sets the formatting options for numbered or bulleted lists. If you want, you can apply formatting to individual levels in the list hierarchy."
-msgstr "设置用于编号或项目符号列表的格式选项。如果需要,您可以在列表层次结构中对各个级别分别应用格式。"
+msgid "Sets the formatting options for ordered or unordered lists. If you want, you can apply formatting to individual levels in the list hierarchy."
+msgstr ""
#. pGwyV
#: 06050500.xhp
@@ -38311,14 +38293,14 @@ msgctxt ""
msgid "Number"
msgstr ""
-#. vcASB
+#. 2JWDd
#: 06050500.xhp
msgctxt ""
"06050500.xhp\n"
"par_id3147261\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/numberingoptionspage/numfmtlb\">Select a numbering style for the selected levels.</ahelp>"
-msgstr "<ahelp hid=\"cui/ui/numberingoptionspage/numfmtlb\">选择选中级别的编号样式。</ahelp>"
+msgid "<ahelp hid=\"cui/ui/numberingoptionspage/numfmtlb\">Select a numbering scheme for the selected levels.</ahelp>"
+msgstr ""
#. mmh24
#: 06050500.xhp
@@ -38509,13 +38491,13 @@ msgctxt ""
msgid "Bullet"
msgstr "项目符号"
-#. RqUuK
+#. ZiJYu
#: 06050500.xhp
msgctxt ""
"06050500.xhp\n"
"par_id3145085\n"
"help.text"
-msgid "Adds a bullet to the beginning of a line. Select this option, and then use the <emph>Character style</emph> drop-down menu to choose a bullet style."
+msgid "Adds a bullet to the beginning of a line. Select this option, and then use the <emph>Character style</emph> drop-down menu to choose a bullet type."
msgstr ""
#. JBJEa
@@ -38572,22 +38554,22 @@ msgctxt ""
msgid "None"
msgstr "无"
-#. ty7BH
+#. kcSkw
#: 06050500.xhp
msgctxt ""
"06050500.xhp\n"
"par_id3149167\n"
"help.text"
-msgid "Does not apply a numbering style."
-msgstr "不应用编号样式。"
+msgid "Does not apply a numbering scheme."
+msgstr ""
-#. P7jbZ
+#. sANUk
#: 06050500.xhp
msgctxt ""
"06050500.xhp\n"
"par_id3145746\n"
"help.text"
-msgid "The availability of the following fields depends on the style that you select in the <emph>Number</emph> box."
+msgid "The availability of the following fields depends on the numbering scheme that you select in the <emph>Number</emph> box."
msgstr ""
#. iqVUE
@@ -38617,14 +38599,14 @@ msgctxt ""
msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Character Style</caseinline></switchinline>"
msgstr ""
-#. zkHUZ
+#. DXsYK
#: 06050500.xhp
msgctxt ""
"06050500.xhp\n"
"par_id3150495\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"cui/ui/numberingoptionspage/charstyle\">Select the Character Style that you want to use in the numbered list.</ahelp> To create or edit a <link href=\"text/swriter/01/05130002.xhp\" name=\"Character Style\">Character Style</link>, open the <emph>Styles</emph> window, click the Character Styles icon, right-click a style, and then choose <emph>New</emph>.</caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"cui/ui/numberingoptionspage/charstyle\">选择要在编号列表中使用的字符样式。</ahelp>要创建或编辑<link href=\"text/swriter/01/05130002.xhp\" name=\"Character Style\">字符样式</link>,请打开「<emph>样式</emph>」窗口,点击「字符样式」图标,右击某一样式,然后选择「<emph>新建</emph>」。</caseinline></switchinline>"
+msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"cui/ui/numberingoptionspage/charstyle\">Select the Character Style that you want to use in an ordered list.</ahelp> To create or edit a <link href=\"text/swriter/01/05130002.xhp\" name=\"Character Style\">Character Style</link>, open the <emph>Styles</emph> window, click the Character Styles icon, right-click a style, and then choose <emph>New</emph>.</caseinline></switchinline>"
+msgstr ""
#. AXZAF
#: 06050500.xhp
@@ -38635,14 +38617,14 @@ msgctxt ""
msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Show sublevels</caseinline></switchinline>"
msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\">显示子级别</caseinline></switchinline>"
-#. tCS4j
+#. 3zFAs
#: 06050500.xhp
msgctxt ""
"06050500.xhp\n"
"par_id3152881\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"cui/ui/numberingoptionspage/sublevels\">Enter the number of previous levels to include in the numbering style. For example, if you enter \"2\" and the previous level uses the \"A, B, C...\" numbering style, the numbering scheme for the current level becomes: \"A.1\".</ahelp></caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"cui/ui/numberingoptionspage/sublevels\">输入要在编号样式中包括的上一级别编号。例如,上一级使用「A、B、C...」的编号样式,如果您输入「2」,则当前层级的编号格式为「A.1」。</ahelp></caseinline></switchinline>"
+msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"cui/ui/numberingoptionspage/sublevels\">Enter the number of previous levels to include in the outline format. For example, if you enter \"2\" and the previous level uses the \"A, B, C...\" numbering scheme, the numbering scheme for the current level becomes: \"A.1\".</ahelp></caseinline></switchinline>"
+msgstr ""
#. 85gXU
#: 06050500.xhp
@@ -38671,14 +38653,14 @@ msgctxt ""
msgid "After"
msgstr "之后"
-#. 9rGAH
+#. UM7wq
#: 06050500.xhp
msgctxt ""
"06050500.xhp\n"
"par_id3150288\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/numberingoptionspage/suffix\">Enter a character or the text to display behind the number in the list. If you want to create a numbered list that uses the style \"1.)\", enter \".)\" in this box.</ahelp>"
-msgstr "<ahelp hid=\"cui/ui/numberingoptionspage/suffix\">输入要在列表编号后显示的字符或文字。要创建使用样式 \"1.)\" 的编号列表,请在此框中输入 \"1.)\"。</ahelp>"
+msgid "<ahelp hid=\"cui/ui/numberingoptionspage/suffix\">Enter a character or the text to display behind the number in the list. If you want to create a ordered list that uses the style \"1.)\", enter \".)\" in this box.</ahelp>"
+msgstr ""
#. FWEse
#: 06050500.xhp
@@ -38689,14 +38671,14 @@ msgctxt ""
msgid "<switchinline select=\"appl\"><caseinline select=\"IMPRESS\">Color</caseinline><caseinline select=\"DRAW\">Color</caseinline></switchinline>"
msgstr "<switchinline select=\"appl\"><caseinline select=\"IMPRESS\">颜色</caseinline><caseinline select=\"DRAW\">颜色</caseinline></switchinline>"
-#. cV8eZ
+#. DDWVd
#: 06050500.xhp
msgctxt ""
"06050500.xhp\n"
"par_id3156060\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\"></caseinline><caseinline select=\"CALC\"></caseinline><caseinline select=\"MATH\"></caseinline><defaultinline><ahelp hid=\"cui/ui/numberingoptionspage/color\">Select a color for the current numbering style.</ahelp></defaultinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\"></caseinline><caseinline select=\"CALC\"></caseinline><caseinline select=\"MATH\"></caseinline><defaultinline><ahelp hid=\"cui/ui/numberingoptionspage/color\">选择当前编号样式的颜色</ahelp></defaultinline></switchinline>"
+msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\"></caseinline><caseinline select=\"CALC\"></caseinline><caseinline select=\"MATH\"></caseinline><defaultinline><ahelp hid=\"cui/ui/numberingoptionspage/color\">Select a color for the current numbering scheme.</ahelp></defaultinline></switchinline>"
+msgstr ""
#. JQB8P
#: 06050500.xhp
@@ -38851,31 +38833,31 @@ msgctxt ""
msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"cui/ui/numberingoptionspage/allsame\">Increases the numbering by one as you go down each level in the list hierarchy.</ahelp></caseinline></switchinline>"
msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"cui/ui/numberingoptionspage/allsame\">在列表层次结构中每向下一个级别,编号就加 1。</ahelp></caseinline></switchinline>"
-#. CwwFP
+#. e5KXW
#: 06050600.xhp
msgctxt ""
"06050600.xhp\n"
"tit\n"
"help.text"
-msgid "Position (List Styles)"
+msgid "Position (Lists)"
msgstr ""
-#. YCPm7
+#. pbtfH
#: 06050600.xhp
msgctxt ""
"06050600.xhp\n"
"hd_id3150467\n"
"help.text"
-msgid "<link href=\"text/shared/01/06050600.xhp\" name=\"Position\">Position</link>"
-msgstr "<link href=\"text/shared/01/06050600.xhp\" name=\"位置\">位置</link>"
+msgid "<variable id=\"positionh1\"><link href=\"text/shared/01/06050600.xhp\" name=\"Position\">Position</link></variable>"
+msgstr ""
-#. 26wKr
+#. ZuAPU
#: 06050600.xhp
msgctxt ""
"06050600.xhp\n"
"par_id3158397\n"
"help.text"
-msgid "<variable id=\"positioninfo\">Sets the indent, spacing, and alignment options for the numbered or bulleted list.</variable>"
+msgid "<variable id=\"positioninfo\">Set indent, spacing, and alignment options for numbering symbols, such as numbers or bullets, to ordered and unordered lists.</variable>"
msgstr ""
#. itRYD
@@ -38887,13 +38869,13 @@ msgctxt ""
msgid "Level"
msgstr "级别"
-#. icEv9
+#. 2gVRo
#: 06050600.xhp
msgctxt ""
"06050600.xhp\n"
"par_id3155755\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/outlinepositionpage/levellb\">Select the level(s) that you want to modify.</ahelp> To apply the options to all the levels, select \"1-10\". In Chapter Numbering, only one level can be selected, or use \"1-10\" to apply the options, except Paragraph style, to all the levels."
+msgid "<ahelp hid=\"modules/swriter/ui/outlinepositionpage/levellb\">Select the level(s) that you want to modify.</ahelp> To apply the options to all the levels, select “1-10”."
msgstr ""
#. qAm3f
@@ -40795,14 +40777,14 @@ msgctxt ""
msgid "<ahelp hid=\"cui/ui/accelconfigpage/AccelConfigPage\">Assigns or edits the shortcut keys for $[officename] commands, or $[officename] Basic macros.</ahelp>"
msgstr "<ahelp hid=\"cui/ui/accelconfigpage/AccelConfigPage\">为$[officename] 命令或者 $[officename] 基本宏指定快捷键或编辑其快捷键。</ahelp>"
-#. 4xgpA
+#. J85qe
#: 06140200.xhp
msgctxt ""
"06140200.xhp\n"
"par_id3154682\n"
"help.text"
-msgid "You can assign or edit shortcut keys for the current application or for all $[officename] applications."
-msgstr "可以指定或编辑用于当前应用程序或所有 $[officename] 应用程序的快捷键。"
+msgid "You can assign or edit shortcut keys for the current application or for all $[officename] applications. To assign a key for all applications, choose the <emph>%PRODUCTNAME</emph> radio button in the top right corner."
+msgstr ""
#. BjkTi
#: 06140200.xhp
@@ -40822,6 +40804,15 @@ msgctxt ""
msgid "If the selected function already has a shortcut key, it is displayed in the <emph>Keys </emph>list. It is possible to assign the same function to more than one key."
msgstr ""
+#. a7WFE
+#: 06140200.xhp
+msgctxt ""
+"06140200.xhp\n"
+"par_id341603939923441\n"
+"help.text"
+msgid "A shortcut key assigned to a particular application overrides the shortcut key setting made in %PRODUCTNAME for all applications."
+msgstr ""
+
#. Fi6Jn
#: 06140200.xhp
msgctxt ""
@@ -44629,14 +44620,14 @@ msgctxt ""
msgid "<ahelp hid=\".\">Inserts an invisible space within a word that will insert a line break once it becomes the last character in a line. Available when complex text layout (CTL) is enabled.</ahelp>"
msgstr "<ahelp hid=\".\">在字词中插入不可见的空格,一旦该空格成为某一行的最后一个字符,它将插入一个换行符。启用复杂文本版式 (Complex Text Layout, CTL) 后可用。</ahelp>"
-#. W4vvs
+#. jHLBC
#: formatting_mark.xhp
msgctxt ""
"formatting_mark.xhp\n"
"hd_id3245643\n"
"help.text"
-msgid "No-width no break"
-msgstr "零宽度不间断空格"
+msgid "Word Joiner"
+msgstr ""
#. 4Ur7Y
#: formatting_mark.xhp
@@ -47707,14 +47698,14 @@ msgctxt ""
msgid "Embedding Fonts"
msgstr "嵌入字体"
-#. MhNdc
+#. MMKaJ
#: prop_font_embed.xhp
msgctxt ""
"prop_font_embed.xhp\n"
"bm_id3149955\n"
"help.text"
-msgid "<bookmark_value>embedding fonts in document file</bookmark_value> <bookmark_value>documents; embedding fonts</bookmark_value> <bookmark_value>font embedding; in documents</bookmark_value> <bookmark_value>fonts; embedding</bookmark_value> <bookmark_value>embedding; fonts</bookmark_value>"
-msgstr "<bookmark_value>在文档中嵌入字体</bookmark_value> <bookmark_value>文档; 嵌入字体</bookmark_value> <bookmark_value>字体嵌入; 在文档中</bookmark_value> <bookmark_value>字体; 嵌入</bookmark_value> <bookmark_value>嵌入; 字体</bookmark_value>"
+msgid "<bookmark_value>embedding fonts in document file</bookmark_value><bookmark_value>documents; embedding fonts</bookmark_value><bookmark_value>font embedding; in documents</bookmark_value><bookmark_value>fonts; embedding</bookmark_value><bookmark_value>fonts; licensing for embedding</bookmark_value><bookmark_value>embedding; fonts</bookmark_value><bookmark_value>embedding licensed fonts</bookmark_value>"
+msgstr ""
#. VdsXE
#: prop_font_embed.xhp
@@ -47734,14 +47725,14 @@ msgctxt ""
msgid "<ahelp hid=\"sfx/ui/documentfontspage/DocumentFontsPage\">Embed document fonts in the current file.</ahelp>"
msgstr "<ahelp hid=\"sfx/ui/documentfontspage/DocumentFontsPage\">当前文件中嵌入文档字体。</ahelp>"
-#. JFNLj
+#. UnyFx
#: prop_font_embed.xhp
msgctxt ""
"prop_font_embed.xhp\n"
"hd_id3149999\n"
"help.text"
-msgid "Fonts embedding"
-msgstr "字体嵌入"
+msgid "Font embedding"
+msgstr ""
#. LM4Gn
#: prop_font_embed.xhp
@@ -47761,6 +47752,15 @@ msgctxt ""
msgid "Consider embedding fonts when your document use rare or custom fonts not generally available in other computers."
msgstr "当文档使用其他计算机中没有广泛提供的罕见字体或自定义字体时, 请考虑嵌入字体。"
+#. AcrZ8
+#: prop_font_embed.xhp
+msgctxt ""
+"prop_font_embed.xhp\n"
+"par_id191616163803305\n"
+"help.text"
+msgid "Font licenses may restrict embedding fonts in documents. Font files contain flags that indicate if and how they can be embedded within a document file. %PRODUCTNAME parses these flags and determines if and how it may be embedded in a document file, and when you open a document containing embedded fonts, it will also look at these flags to determine if and how a document can be viewed or edited."
+msgstr ""
+
#. iBvGV
#: ref_epub_export.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/shared/02.po b/source/zh-CN/helpcontent2/source/text/shared/02.po
index 26c59644c7e..aefc11bdb3e 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/02.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/02.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-01-30 15:37+0100\n"
+"POT-Creation-Date: 2021-03-23 11:44+0100\n"
"PO-Revision-Date: 2020-02-05 07:21+0000\n"
"Last-Translator: Adolfo Jayme Barrientos <fito@libreoffice.org>\n"
"Language-Team: Chinese (Simplified) <https://weblate.documentfoundation.org/projects/libo_help-master/textshared02/zh_Hans/>\n"
@@ -11266,22 +11266,22 @@ msgctxt ""
msgid "Character Highlighting Color"
msgstr ""
-#. tExR8
+#. 5GRDP
#: 02160000.xhp
msgctxt ""
"02160000.xhp\n"
"hd_id3109850\n"
"help.text"
-msgid "<link href=\"text/shared/02/02160000.xhp\" name=\"Highlight Color\">Character Highlighting Color</link>"
+msgid "<link href=\"text/shared/02/02160000.xhp\" name=\"Highlight Color\">Highlighting</link>"
msgstr ""
-#. y45WA
+#. 6EDWk
#: 02160000.xhp
msgctxt ""
"02160000.xhp\n"
"par_id3154927\n"
"help.text"
-msgid "<variable id=\"highlight_color\"><ahelp hid=\".uno:BackColor\">Applies current highlight color to the character style or text selection.</ahelp></variable>"
+msgid "<variable id=\"highlight_color\"><ahelp hid=\".uno:BackColor\">Applies current highlighting color to the <switchinline select=\"appl\"><caseinline select=\"WRITER\">character style or</caseinline></switchinline> text selection.</ahelp></variable>"
msgstr ""
#. KrAa6
@@ -11302,6 +11302,15 @@ msgctxt ""
msgid "When editing a character style, choose <emph>Highlighting</emph> tab."
msgstr ""
+#. 8NF47
+#: 02160000.xhp
+msgctxt ""
+"02160000.xhp\n"
+"par_id481613812856744\n"
+"help.text"
+msgid "Click the <emph>Character Highlighting Color</emph> icon on the <switchinline select=\"appl\"><caseinline select=\"WRITER\">Formatting bar, Text Object bar or Character section of Properties Sidebar.</caseinline><defaultinline><emph>Text Formatting bar.</emph></defaultinline></switchinline>"
+msgstr ""
+
#. YETEY
#: 02160000.xhp
msgctxt ""
@@ -11356,13 +11365,13 @@ msgctxt ""
msgid "Select the text that you want to highlight."
msgstr ""
-#. 94UES
+#. AQAQh
#: 02160000.xhp
msgctxt ""
"02160000.xhp\n"
"par_id851610983100948\n"
"help.text"
-msgid "Click the <emph>Character Highlighting Color</emph> icon on the <emph>Formatting</emph> bar."
+msgid "Click the <emph>Character Highlighting Color</emph> icon on the <switchinline select=\"appl\"><caseinline select=\"WRITER\"><emph>Formatting</emph> or <emph>Text Object</emph></caseinline><defaultinline><emph>Text Formatting</emph></defaultinline></switchinline> bar."
msgstr ""
#. bVPsm
@@ -11473,13 +11482,13 @@ msgctxt ""
msgid "Select the highlighted text."
msgstr "选择高亮显示的文本。"
-#. BTFWr
+#. yRMNb
#: 02160000.xhp
msgctxt ""
"02160000.xhp\n"
"par_id3149784\n"
"help.text"
-msgid "On the <emph>Formatting</emph> bar, click the arrow next to the <emph>Character Highlighting Color</emph> icon, and then click <emph>No Fill</emph>."
+msgid "On the <switchinline select=\"appl\"><caseinline select=\"WRITER\"/><defaultinline><emph>Text</emph></defaultinline></switchinline> <emph>Formatting</emph> bar, click the arrow next to the <emph>Character Highlighting Color</emph> icon, and then click <emph>No Fill</emph>."
msgstr ""
#. yDDr8
@@ -12346,23 +12355,23 @@ msgctxt ""
msgid "Move Down"
msgstr "向下移动"
-#. qjHwq
+#. ZvBbZ
#: 06120000.xhp
msgctxt ""
"06120000.xhp\n"
"tit\n"
"help.text"
-msgid "Bullets On/Off"
-msgstr "项目符号打开/关闭"
+msgid "Toggle Unordered List"
+msgstr ""
-#. 2pB5k
+#. CCrby
#: 06120000.xhp
msgctxt ""
"06120000.xhp\n"
"hd_id3154228\n"
"help.text"
-msgid "<link href=\"text/shared/02/06120000.xhp\" name=\"Bullets On/Off\">Bullets On/Off</link>"
-msgstr "<link href=\"text/shared/02/06120000.xhp\" name=\"Bullets On/Off\">项目符号打开/关闭</link>"
+msgid "<link href=\"text/shared/02/06120000.xhp\" name=\"Bullets On/Off\">Toggle Unordered List</link>"
+msgstr ""
#. GQ9yd
#: 06120000.xhp
@@ -12409,23 +12418,23 @@ msgctxt ""
msgid "<switchinline select=\"appl\"><caseinline select=\"IMPRESS\">The distance between the text and the left text box and the position of the bullets can be determined in the dialog under <link href=\"text/shared/01/05030100.xhp\" name=\"Format - Paragraph\"><emph>Format - Paragraph</emph></link> by entering the left indent and the first-line indent.</caseinline></switchinline>"
msgstr ""
-#. QCjAp
+#. X9H2x
#: 06120000.xhp
msgctxt ""
"06120000.xhp\n"
"par_id3150355\n"
"help.text"
-msgid "<image id=\"img_id3157909\" src=\"cmd/sc_defaultbullet.png\" width=\"0.222inch\" height=\"0.222inch\"><alt id=\"alt_id3157909\">Icon</alt></image>"
-msgstr "<image id=\"img_id3157909\" src=\"cmd/sc_defaultbullet.png\" width=\"0.222inch\" height=\"0.222inch\"><alt id=\"alt_id3157909\">图标</alt></image>"
+msgid "<image id=\"img_id3157909\" src=\"cmd/lc_defaultbullet.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3157909\">Icon</alt></image>"
+msgstr ""
-#. iHX8u
+#. TEain
#: 06120000.xhp
msgctxt ""
"06120000.xhp\n"
"par_id3149233\n"
"help.text"
-msgid "Bullets On/Off"
-msgstr "项目符号打开/关闭"
+msgid "Toggle Unordered List"
+msgstr ""
#. 6UAmF
#: 07010000.xhp
@@ -12823,14 +12832,41 @@ msgctxt ""
msgid "<variable id=\"hyperdiatext\"><ahelp hid=\".\">Opens a dialog that enables you to create and edit hyperlinks.</ahelp></variable>"
msgstr "<variable id=\"hyperdiatext\"><ahelp hid=\".\">打开用于创建和编辑超链接的对话框。</ahelp></variable>"
-#. thKGB
+#. H5bDr
+#: 09070000.xhp
+msgctxt ""
+"09070000.xhp\n"
+"par_id511616406933483\n"
+"help.text"
+msgid "Choose <menuitem>Insert - Hyperlink</menuitem>."
+msgstr ""
+
+#. CFNbD
+#: 09070000.xhp
+msgctxt ""
+"09070000.xhp\n"
+"par_id771616410590648\n"
+"help.text"
+msgid "Choose <menuitem>Edit - Hyperlink</menuitem>, when the cursor is placed in a hyperlink."
+msgstr ""
+
+#. E6FB3
+#: 09070000.xhp
+msgctxt ""
+"09070000.xhp\n"
+"par_id161616407054506\n"
+"help.text"
+msgid "On <link href=\"text/shared/main0201.xhp\" name=\"Standard Bar\"><emph>Standard</emph></link> bar, click"
+msgstr ""
+
+#. MSjJA
#: 09070000.xhp
msgctxt ""
"09070000.xhp\n"
"par_id3154927\n"
"help.text"
-msgid "<image id=\"img_id3093440\" src=\"cmd/sc_hyperlinkdialog.png\" width=\"0.1665in\" height=\"0.1665in\"><alt id=\"alt_id3093440\">Icon</alt></image>"
-msgstr "<image id=\"img_id3093440\" src=\"cmd/sc_hyperlinkdialog.png\" width=\"0.1665in\" height=\"0.1665in\"><alt id=\"alt_id3093440\">图标</alt></image>"
+msgid "<image id=\"img_id3093440\" src=\"cmd/sc_hyperlinkdialog.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3093440\">Icon</alt></image>"
+msgstr ""
#. Dty7B
#: 09070000.xhp
@@ -13363,6 +13399,15 @@ msgctxt ""
msgid "Document"
msgstr "文档"
+#. 8Cn55
+#: 09070300.xhp
+msgctxt ""
+"09070300.xhp\n"
+"bm_id551615667308718\n"
+"help.text"
+msgid "<bookmark_value>hyperlinks;to files</bookmark_value> <bookmark_value>hyperlinks;to folders</bookmark_value>"
+msgstr ""
+
#. RCfpV
#: 09070300.xhp
msgctxt ""
@@ -13381,6 +13426,15 @@ msgctxt ""
msgid "<ahelp hid=\".\">Enter a <emph>URL</emph> for the file that you want to open when you click the hyperlink. If you do not specify a target frame, the file opens in the current document or frame.</ahelp>"
msgstr "<ahelp hid=\".\">为您点击超链接时想要打开的文件输入「<emph>URL</emph>」。如果您没有指定目标框架,文件在当前文档或框架中打开。</ahelp>"
+#. taJit
+#: 09070300.xhp
+msgctxt ""
+"09070300.xhp\n"
+"par_id91615666930995\n"
+"help.text"
+msgid "If the URL refers to a <emph>folder</emph>, the standard file manager in your operating system opens showing the contents of the specified folder."
+msgstr ""
+
#. GQcJJ
#: 09070300.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/shared/04.po b/source/zh-CN/helpcontent2/source/text/shared/04.po
index 7827e4661a4..60e839c950c 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/04.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/04.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-02-05 18:59+0100\n"
+"POT-Creation-Date: 2021-03-19 17:31+0100\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"
@@ -70,13 +70,13 @@ msgctxt ""
msgid "When operating your application, you can choose between using the mouse or the keyboard for almost all of the operations available."
msgstr "在应用程序使用过程中,对于几乎所有的操作,您都可以在使用鼠标还是键盘之间进行选择。"
-#. iE2uQ
+#. Q2ALG
#: 01010000.xhp
msgctxt ""
"01010000.xhp\n"
"hd_id3154186\n"
"help.text"
-msgid "Calling Menus With Shortcut Keys"
+msgid "Calling Menus with Mnemonics"
msgstr ""
#. Lv2Sv
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 ae773f7fab0..dd29c23329e 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-02-01 17:02+0100\n"
+"POT-Creation-Date: 2021-03-19 17:31+0100\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,465 +16,6 @@ msgstr ""
"X-Generator: LibreOffice\n"
"X-POOTLE-MTIME: 1562722697.000000\n"
-#. n4gFz
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"tit\n"
-"help.text"
-msgid "Relations"
-msgstr "关系"
-
-#. Mdpfp
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"hd_id3153323\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/05020000.xhp\" name=\"Relations\">Relations</link>"
-msgstr "<link href=\"text/shared/explorer/database/05020000.xhp\" name=\"关系\">关系</link>"
-
-#. GxBiD
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"bm_id3146957\n"
-"help.text"
-msgid "<bookmark_value>relational databases (Base)</bookmark_value>"
-msgstr "<bookmark_value>关系数据库 (Base)</bookmark_value>"
-
-#. YYXkm
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"par_id3146957\n"
-"help.text"
-msgid "This command opens the <emph>Relation Design </emph>window, which allows you to define relationships between various database tables."
-msgstr "此命令可打开「<emph>关系设计</emph>」窗口,可以在其中定义各种数据库表格之间的关系。"
-
-#. vMuED
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"par_id3154823\n"
-"help.text"
-msgid "<ahelp hid=\"HID_CTL_RELATIONTAB\">Here you can link together tables from the current database through common data fields.</ahelp> Click the <emph>New Relation</emph> icon to create the relationships, or simply drag-and-drop with the mouse."
-msgstr "<ahelp hid=\"HID_CTL_RELATIONTAB\">在此可以通过公用数据字段将当前数据库中的表格链接在一起。</ahelp>点击「<emph>新建关系</emph>」图标或只通过鼠标拖放操作来创建关系。"
-
-#. zHWMJ
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"par_id3145316\n"
-"help.text"
-msgid "This function is only available if you are working with a relational database."
-msgstr "此功能仅适用于关系数据库。"
-
-#. 5MXvo
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"par_id3149235\n"
-"help.text"
-msgid "When you choose <emph>Tools - Relationships</emph>, a window opens in which all the existing relationships between the tables of the current database are shown. If no relationships have been defined, or if you want to relate other tables of the database to each other, then click on the <emph>Add Tables</emph> icon. The <link href=\"text/shared/02/14020100.xhp\" name=\"Add Tables\">Add Tables</link> dialog opens in which you can select the tables with which to create a relation."
-msgstr "选择「<emph>工具 - 关系</emph>」时将打开一个窗口,其中显示了当前数据库各个表格之间的所有现有关系。如果尚未定义任何关系,或者要在数据库的其他表格之间创建关系,请点击「<emph>添加表格</emph>」图标。此时将打开「<link href=\"text/shared/02/14020100.xhp\" name=\"Add Tables\">添加表格</link>」对话框,可以在该对话框中选择要创建关系的表格。"
-
-#. krxTw
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"par_id3152812\n"
-"help.text"
-msgid "If the <emph>Relation Design</emph> window is open, the selected tables cannot be modified, even in Table Design mode. This ensures that tables are not changed while the relations are being created."
-msgstr "如果「<emph>关系设计</emph>」窗口处于打开状态,则即使在表格设计模式下也无法修改选中的表格。这样可以确保在创建关系的过程中表格不会被修改。"
-
-#. zZFEP
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"par_id3150541\n"
-"help.text"
-msgid "The selected tables are shown in the top area of the relation design view. You can close a table window through the context menu or with the Delete key."
-msgstr "选择的数据表将显示在关系设计视图的上方区域。您可以通过右键菜单或用删除键重新删除一个表格窗口。"
-
-#. uJVYH
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"bm_id3148922\n"
-"help.text"
-msgid "<bookmark_value>primary keys;inserting (Base)</bookmark_value><bookmark_value>keys;primary keys (Base)</bookmark_value><bookmark_value>external keys (Base)</bookmark_value>"
-msgstr "<bookmark_value>主关键字; 插入 (Base)</bookmark_value><bookmark_value>关键字; 主关键字 (Base)</bookmark_value><bookmark_value>外部关键字 (Base)</bookmark_value>"
-
-#. ek2aE
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"hd_id3148922\n"
-"help.text"
-msgid "Primary key and foreign keys"
-msgstr "主关键字和外部关键字"
-
-#. ksuDX
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"par_id3149168\n"
-"help.text"
-msgid "If you want to define a relation among the various tables, you should enter a <link href=\"text/shared/00/00000005.xhp#primaerschluessel\" name=\"primary key\">primary key</link> that uniquely identifies a data field of an existing table. You can refer to the primary key from other tables to access the data of this table. All data fields referring to this primary key will be identified as a foreign key."
-msgstr "如果要在不同的表格之间定义关系,则需要输入「<link href=\"text/shared/00/00000005.xhp#primaerschluessel\" name=\"primary key\">主关键字</link>」,以明确标识现有表格的某个数据字段。然后可以从其他表格中引用该主关键字来读取该表格中的数据。引用主关键字的所有数据字段将被标识为外部关键字。"
-
-#. FACvb
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"par_id3147085\n"
-"help.text"
-msgid "All data fields referring to a primary key will be identified in the table window by a small key symbol."
-msgstr "主关键字指定的数据字段在表格窗口中用一个小的关键字图标标明。"
-
-#. vro8F
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"hd_id3153193\n"
-"help.text"
-msgid "Define relations"
-msgstr "定义关系"
-
-#. wmwWU
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"bm_id3155430\n"
-"help.text"
-msgid "<bookmark_value>relations; creating and deleting (Base)</bookmark_value>"
-msgstr "<bookmark_value>关系; 创建和删除 (Base)</bookmark_value>"
-
-#. pGNLA
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"par_id3155430\n"
-"help.text"
-msgid "All existing relations are shown in the relations windows by a line that connects the primary and foreign key fields. You can add a relation by using drag-and-drop to drop the field of one table onto the field of the other table. A relation is removed again by selecting it and pressing the Delete key."
-msgstr "在关系窗口中,所有现有关系用线条显示,主关键字字段和外部关键字字段通过该线条相互连接。通过将一个表格中的字段拖到其他表格的字段中,可以新增关系。选择关系并按 Delete 键,可以再次删除创建的关系。"
-
-#. McRUh
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"par_id3149984\n"
-"help.text"
-msgid "Alternatively, you can also click the <emph>New Relation</emph> icon in the top area of the relation field and define the relation between two tables in the <link href=\"text/shared/explorer/database/05020100.xhp\" name=\"Relations\"><emph>Relations</emph></link> dialog."
-msgstr "另外,您也可以通过点击关系字段上方区域中的「<emph>新建关系</emph>」图标,在<link href=\"text/shared/explorer/database/05020100.xhp\" name=\"关系\"><emph>关系</emph></link>对话框中定义两个表格之间的关系。"
-
-#. yTadX
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"par_id3153093\n"
-"help.text"
-msgid "If you use $[officename] as the front-end for a relational database, the creation and deletion of relationships is not placed in an intermediate memory by $[officename], but is forwarded directly to the database."
-msgstr "如果将 $[officename] 用作关系数据库的前端,则关系的创建和删除不会由 $[officename] 暂时存储,而是被直接提交到数据库。"
-
-#. bnCjW
-#: 05020000.xhp
-msgctxt ""
-"05020000.xhp\n"
-"par_id3155856\n"
-"help.text"
-msgid "By double-clicking a connection line, you can assign certain properties to the relation. The <emph>Relations </emph>dialog opens."
-msgstr "双击连接线打开「<emph>关系</emph>」对话框,可以在其中指定关系的某些属性。"
-
-#. zaiku
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"tit\n"
-"help.text"
-msgid "Relations"
-msgstr "关系"
-
-#. BAAZE
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"bm_id3150499\n"
-"help.text"
-msgid "<bookmark_value>relations; properties (Base)</bookmark_value><bookmark_value>key fields for relations (Base)</bookmark_value><bookmark_value>cascading update (Base)</bookmark_value>"
-msgstr "<bookmark_value>关系; 属性 (Base)</bookmark_value><bookmark_value>关系的关键字字段 (Base)</bookmark_value><bookmark_value>层叠更新 (Base)</bookmark_value>"
-
-#. tDgC3
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"hd_id3150445\n"
-"help.text"
-msgid "Relations"
-msgstr "关系"
-
-#. 5fAEp
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3150499\n"
-"help.text"
-msgid "<ahelp hid=\".uno:DBAddRelation\">Allows you to define and edit a relation between two tables.</ahelp>"
-msgstr "<ahelp hid=\".uno:DBAddRelation\">允许您定义和修改两表格之间的关系。</ahelp>"
-
-#. yHc9N
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3155136\n"
-"help.text"
-msgid "The update and delete options are only available if they are supported by the database used."
-msgstr "仅当使用的数据库支持更新和删除选项时,这些选项才可用。"
-
-#. BDC5P
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"hd_id3155341\n"
-"help.text"
-msgid "Tables"
-msgstr "表格"
-
-#. BAGsd
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3153880\n"
-"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/relationdialog/table2\" visibility=\"hidden\">This is where the two related tables are listed.</ahelp> If you create a new relation, you can select one table from each of the combo boxes in the top part of the dialog."
-msgstr "<ahelp hid=\"dbaccess/ui/relationdialog/table2\" visibility=\"hidden\">在此列出两张相关表格。</ahelp>如果创建一个新关系,可从对话框上部的两个组合框中各选择一张表格。"
-
-#. 4UCC7
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3154047\n"
-"help.text"
-msgid "If you opened the <emph>Relations</emph> dialog for an existing relation by double-clicking the connection lines in the Relation window, then the tables involved in the relation cannot be modified."
-msgstr "在「关系」窗口中,如果通过双击连接线打开了现有关系的「<emph>关系</emph>」对话框,则无法修改该关系中涉及的表格。"
-
-#. VBeNf
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"hd_id3153822\n"
-"help.text"
-msgid "Key fields"
-msgstr "关键字字段"
-
-#. CnkB6
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3159157\n"
-"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/joindialog/relations\">Defines the key fields for the relation.</ahelp>"
-msgstr "<ahelp hid=\"dbaccess/ui/joindialog/relations\">定义关系的关键字字段。</ahelp>"
-
-#. tG7Wy
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3149235\n"
-"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/relationdialog/table2\">The names of the tables selected for the link appear here as column names.</ahelp> If you click a field, you can use the arrow buttons to select a field from the table. Each relation is written in a row."
-msgstr "<ahelp hid=\"dbaccess/ui/relationdialog/table2\">为链接选择的表格名称在这里显示为列名称。</ahelp>如果点击某个字段,可以通过箭头按钮选择表格中的字段。一行写入一个关系。"
-
-#. ECqps
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"hd_id3145609\n"
-"help.text"
-msgid "Update options"
-msgstr "更新选项"
-
-#. TcZQE
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3153061\n"
-"help.text"
-msgid "Here you can select options that take effect when there are changes to a primary key field."
-msgstr "选择修改主关键字字段时生效的选项。"
-
-#. SNgAC
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"hd_id3149046\n"
-"help.text"
-msgid "No action"
-msgstr "无操作"
-
-#. BQgh9
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3152360\n"
-"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/relationdialog/addaction\">Specifies that any change made to a primary key does not affect other external key fields.</ahelp>"
-msgstr "<ahelp hid=\"dbaccess/ui/relationdialog/addaction\">指定修改主关键字时不影响其他外部关键字字段。</ahelp>"
-
-#. UzK5q
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"hd_id3148664\n"
-"help.text"
-msgid "Updating cascade"
-msgstr "更新层叠"
-
-#. GFtru
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3154073\n"
-"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/relationdialog/addcascade\">Updates all the external key fields if the value of the corresponding primary key has been modified (Cascading Update).</ahelp>"
-msgstr "<ahelp hid=\"dbaccess/ui/relationdialog/addcascade\">如果修改了主关键字的值,则更新所有外部关键字字段 (层叠更新)。</ahelp>"
-
-#. xydLE
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"hd_id3145171\n"
-"help.text"
-msgid "Set null"
-msgstr "设置为 null"
-
-#. ksYnw
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3154123\n"
-"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/relationdialog/addnull\"> If the corresponding primary key has been modified, use this option to set the \"IS NULL\" value to all external key fields. IS NULL means that the field is empty.</ahelp>"
-msgstr "<ahelp hid=\"dbaccess/ui/relationdialog/addnull\">如果修改了相应主关键字,则使用此选项可将所有对应的外部关键字段设置为 \"IS NULL\"。此处 \"IS NULL\" 表示该字段为空。</ahelp>"
-
-#. FGxMC
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"hd_id3150448\n"
-"help.text"
-msgid "Set default"
-msgstr "设置默认"
-
-#. T7dEQ
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3151041\n"
-"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/relationdialog/adddefault\"> If the corresponding primary key has been modified, use this option to set a default value to all external key fields.</ahelp> During the creation of the corresponding table, the default value of an external key field will be defined when you assign the field properties."
-msgstr "<ahelp hid=\"dbaccess/ui/relationdialog/adddefault\">如果相应的主关键字被修改,可使用此选项给所有外部关键字字段指定一个默认值。</ahelp>在相应表格的创建过程中,指定字段属性时将定义外部关键字字段的默认值。"
-
-#. AvWBL
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"hd_id3125863\n"
-"help.text"
-msgid "Delete options"
-msgstr "删除的选项"
-
-#. ayyns
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3153193\n"
-"help.text"
-msgid "Here you can select options that take effect when a primary key field is deleted."
-msgstr "选择删除主关键字字段时生效的选项。"
-
-#. jTCSL
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"hd_id3159252\n"
-"help.text"
-msgid "No action"
-msgstr "无操作"
-
-#. PgDqt
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3145785\n"
-"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/relationdialog/delaction\">Specifies that the deletion of a primary key will not have any effect on other external key fields.</ahelp>"
-msgstr "<ahelp hid=\"dbaccess/ui/relationdialog/delaction\">指定删除主关键字不会影响其他外部关键字字段。</ahelp>"
-
-#. hFmB4
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"hd_id3154146\n"
-"help.text"
-msgid "Delete cascade"
-msgstr "删除层叠"
-
-#. ESpAp
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3155309\n"
-"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/relationdialog/delcascade\">Specifies that all external key fields will be deleted if you delete the corresponding primary key field.</ahelp>"
-msgstr "<ahelp hid=\"dbaccess/ui/relationdialog/delcascade\">指定如果删除相应主关键字字段,则删除所有外部关键字字段。</ahelp>"
-
-#. ZaNTh
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3153140\n"
-"help.text"
-msgid "When you delete a primary key field with the<emph> Delete cascade </emph>option, all records from other tables that have this key as their foreign key are also deleted. Use this option with great care; it is possible that a major portion of the database can be deleted."
-msgstr "如果通过「<emph>删除层叠</emph>」选项删除主关键字字段,则其他以该关键字作为外部关键字的表格中的所有记录也将被删除。因此,请谨慎使用此选项,以避免删除数据库的主要部分。"
-
-#. mAu9C
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"hd_id3152596\n"
-"help.text"
-msgid "Set null"
-msgstr "设置为 null"
-
-#. dAtCx
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3153363\n"
-"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/relationdialog/delnull\">If you delete the corresponding primary key, the \"IS NULL\" value will be assigned to all external key fields.</ahelp>"
-msgstr "<ahelp hid=\"dbaccess/ui/relationdialog/delnull\">如果删除相应主关键字,则会将所有外部关键字字段指定为 \"IS NULL\" 值。</ahelp>"
-
-#. 474LG
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"hd_id3145272\n"
-"help.text"
-msgid "Set Default"
-msgstr "设置默认"
-
-#. ktJ6K
-#: 05020100.xhp
-msgctxt ""
-"05020100.xhp\n"
-"par_id3154320\n"
-"help.text"
-msgid "<ahelp hid=\"dbaccess/ui/relationdialog/deldefault\">If you delete the corresponding primary key, a set value will be set to all external key fields.</ahelp>"
-msgstr "<ahelp hid=\"dbaccess/ui/relationdialog/deldefault\">如果删除了相应主关键字,则将设置值指定给所有外部关键字字段。</ahelp>"
-
#. x8A6E
#: 05030000.xhp
msgctxt ""
@@ -3769,15 +3310,6 @@ msgctxt ""
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>"
-#. V9baD
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN10610\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>"
-
#. bbTEe
#: dabawiz00.xhp
msgctxt ""
@@ -4795,132 +4327,6 @@ msgctxt ""
msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">数据库向导</link>"
-#. XLfeM
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"tit\n"
-"help.text"
-msgid "LDAP Connection"
-msgstr "LDAP 连接"
-
-#. E4K9F
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"bm_id22583\n"
-"help.text"
-msgid "<bookmark_value>LDAP server; address books (Base)</bookmark_value><bookmark_value>address books; LDAP server (Base)</bookmark_value><bookmark_value>data sources; LDAP server (Base)</bookmark_value>"
-msgstr "<bookmark_value>LDAP 服务器; 通讯簿 (Base)</bookmark_value><bookmark_value>通讯簿; LDAP 服务器 (Base)</bookmark_value><bookmark_value>数据源; LDAP 服务器 (Base)</bookmark_value>"
-
-#. HDgwj
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"par_idN10554\n"
-"help.text"
-msgid "<variable id=\"ldap\"><link href=\"text/shared/explorer/database/dabawiz02ldap.xhp\">LDAP Connection</link></variable>"
-msgstr "<variable id=\"ldap\"><link href=\"text/shared/explorer/database/dabawiz02ldap.xhp\">LDAP 连接</link></variable>"
-
-#. Xdbya
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"par_idN10558\n"
-"help.text"
-msgid "<ahelp hid=\".\">Specifies the settings for importing a database using LDAP</ahelp> (<emph>Lightweight Directory Access Protocol)</emph>. This page is only available if you registered an LDAP server as an address database."
-msgstr "<ahelp hid=\".\">指定使用 LDAP</ahelp> (<emph>简单目录访问协议) </emph>导入数据库的设置。仅当您将 LDAP 服务器注册为地址数据库时,此页才可用。"
-
-#. ZMeDx
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"par_idN10579\n"
-"help.text"
-msgid "Server URL"
-msgstr "服务器 URL"
-
-#. ScRnC
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"par_idN1057D\n"
-"help.text"
-msgid "<ahelp hid=\"HID_DSADMIN_LDAP_HOSTNAME\">Enter the name of the LDAP server using the format \"ldap.server.com\".</ahelp>"
-msgstr "<ahelp hid=\"HID_DSADMIN_LDAP_HOSTNAME\">输入 LDAP 服务器的名称,格式为 \"ldap.server.com\"。</ahelp>"
-
-#. WRJRs
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"par_idN10594\n"
-"help.text"
-msgid "Base DN"
-msgstr "基位置 DN"
-
-#. kFVmv
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"par_idN10598\n"
-"help.text"
-msgid "<ahelp hid=\"HID_DSADMIN_LDAP_BASEDN\">Enter the starting point to search the LDAP database, for example, \"dc=com\".</ahelp>"
-msgstr "<ahelp hid=\"HID_DSADMIN_LDAP_BASEDN\">输入查找 LDAP 数据库的起点,例如,\"dc=com\"。</ahelp>"
-
-#. AKFCR
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"par_idN105B7\n"
-"help.text"
-msgid "Port number"
-msgstr "端口号"
-
-#. 9Bhwf
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"par_idN105BB\n"
-"help.text"
-msgid "<ahelp hid=\"HID_DSADMIN_LDAP_PORTNUMBER\">Enter the port of the LDAP server, normally 389.</ahelp>"
-msgstr "<ahelp hid=\"HID_DSADMIN_LDAP_PORTNUMBER\">输入 LDAP 服务器的端口,通常为 389。</ahelp>"
-
-#. 8FGvh
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"par_idN105CA\n"
-"help.text"
-msgid "Use secure connection (SSL)"
-msgstr "使用安全连接 (SSL)"
-
-#. REnMu
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"par_idN105CE\n"
-"help.text"
-msgid "<ahelp hid=\"HID_DSADMIN_USESSL_LDAP\">Creates a secure connection to the LDAP server through the Secure Sockets Layer (SSL).</ahelp> By default, an SSL connection uses port 636. A regular connection uses port 389."
-msgstr "<ahelp hid=\"HID_DSADMIN_USESSL_LDAP\">通过「安全套接字层 (SSL)」创建到 LDAP 服务器的安全连接。</ahelp> 默认情况下,SSL 连接使用端口 636。常规连接使用端口 389。"
-
-#. PXBAE
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"par_idN105DE\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">Authentication</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">验证</link>"
-
-#. EkPas
-#: dabawiz02ldap.xhp
-msgctxt ""
-"dabawiz02ldap.xhp\n"
-"par_idN105F5\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>"
-
#. Y4EFA
#: dabawiz02mysql.xhp
msgctxt ""
@@ -6640,14 +6046,14 @@ msgctxt ""
msgid "Relationships"
msgstr "关系"
-#. agJkV
+#. DKgXb
#: menutools.xhp
msgctxt ""
"menutools.xhp\n"
"par_idN10576\n"
"help.text"
-msgid "<ahelp hid=\".\">Opens the <link href=\"text/shared/explorer/database/05020000.xhp\">Relation Design</link> view and checks whether the database connection supports relations.</ahelp>"
-msgstr "<ahelp hid=\".\">打开<link href=\"text/shared/explorer/database/05020000.xhp\">关系设计</link>视图,并检查数据库连接是否支持关系。</ahelp>"
+msgid "<ahelp hid=\".\">Opens the <link href=\"text/sdatabase/05020000.xhp\">Relation Design</link> view and checks whether the database connection supports relations.</ahelp>"
+msgstr ""
#. B2YV6
#: menutools.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/shared/guide.po b/source/zh-CN/helpcontent2/source/text/shared/guide.po
index e89002051a2..66396a9ba70 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-02-22 17:17+0100\n"
+"POT-Creation-Date: 2021-03-19 17:31+0100\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"
@@ -8161,13 +8161,13 @@ msgctxt ""
msgid "Tables"
msgstr "表格"
-#. k3n7x
+#. Gcdea
#: database_main.xhp
msgctxt ""
"database_main.xhp\n"
"par_id3163713\n"
"help.text"
-msgid "<link href=\"text/sdatabase/05010000.xhp\" name=\"Create new table, edit table structure\">Create new table, edit table structure</link>, <link href=\"text/sdatabase/05010100.xhp\" name=\"index\">index</link>, <link href=\"text/shared/explorer/database/05020000.xhp\" name=\"relations\">relations</link>"
+msgid "<link href=\"text/sdatabase/05010000.xhp\" name=\"Create new table, edit table structure\">Create new table, edit table structure</link>, <link href=\"text/sdatabase/05010100.xhp\" name=\"index\">index</link>, <link href=\"text/sdatabase/05020000.xhp\" name=\"relations\">relations</link>"
msgstr ""
#. AENyR
@@ -18619,68 +18619,77 @@ msgctxt ""
msgid "Bullets and Numbering of paragraphs is supported only in Writer, Impress and Draw."
msgstr "段落的项目符号与编号仅在 Writer、Impress 和 Draw 中支持。"
-#. 4DAtN
+#. LnEF2
+#: numbering_stop.xhp
+msgctxt ""
+"numbering_stop.xhp\n"
+"par_id3147618\n"
+"help.text"
+msgid "For the current paragraph or selected paragraphs you can switch off the automatic numbering or listing. Click the <emph>No List</emph> icon in the <emph>Formatting</emph> bar. The list indenting is also removed."
+msgstr ""
+
+#. R49Gn
#: numbering_stop.xhp
msgctxt ""
"numbering_stop.xhp\n"
"par_id3154288\n"
"help.text"
-msgid "<image id=\"img_id3153527\" src=\"cmd/sc_removebullets.png\" width=\"0.222in\" height=\"0.222in\"><alt id=\"alt_id3153527\">Icon</alt></image>"
-msgstr "<image id=\"img_id3153527\" src=\"cmd/sc_removebullets.png\" width=\"0.222in\" height=\"0.222in\"><alt id=\"alt_id3153527\">图标</alt></image>"
+msgid "<image id=\"img_id3153527\" src=\"cmd/lc_removebullets.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3153527\">No List icon</alt></image>"
+msgstr ""
-#. zSuGJ
+#. nFCu3
#: numbering_stop.xhp
msgctxt ""
"numbering_stop.xhp\n"
-"par_id3150443\n"
+"par_id151614326512513\n"
"help.text"
-msgid "<image id=\"img_id3163802\" src=\"cmd/sc_defaultbullet.png\" width=\"0.222in\" height=\"0.222in\"><alt id=\"alt_id3163802\">Icon</alt></image>"
-msgstr "<image id=\"img_id3163802\" src=\"cmd/sc_defaultbullet.png\" width=\"0.222in\" height=\"0.222in\"><alt id=\"alt_id3163802\">图标</alt></image>"
+msgid "No List icon"
+msgstr ""
-#. it4t7
+#. Uzqm6
#: numbering_stop.xhp
msgctxt ""
"numbering_stop.xhp\n"
-"par_id3147618\n"
+"par_id3144511\n"
"help.text"
-msgid "For the current paragraph or selected paragraphs you can switch off the automatic numbering or listing. Click the <emph>Numbering Off</emph> icon in the <emph>Bullets and Numbering</emph> bar."
-msgstr "对于当前段落或选中的段落,可以关闭自动编号或列表功能。点击「<emph>项目符号与编号</emph>」栏上的「<emph>关闭编号</emph>」图标。"
+msgid "If the cursor is located within a numbered or bulleted list, you can turn off automatic numbers or bullets for the current paragraph or selected paragraphs by clicking the <emph>Toggle Unordered List</emph> icon on the <emph>Text Formatting</emph> bar."
+msgstr ""
-#. CcCTx
+#. XLYd6
#: numbering_stop.xhp
msgctxt ""
"numbering_stop.xhp\n"
"par_id3155449\n"
"help.text"
-msgid "<image id=\"img_id3158432\" src=\"cmd/sc_defaultbullet.png\" width=\"0.222in\" height=\"0.222in\"><alt id=\"alt_id3158432\">Icon</alt></image>"
-msgstr "<image id=\"img_id3158432\" src=\"cmd/sc_defaultbullet.png\" width=\"0.222in\" height=\"0.222in\"><alt id=\"alt_id3158432\">图标</alt></image>"
+msgid "<image id=\"img_id3158432\" src=\"cmd/lc_defaultbullet.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3158432\">Icon</alt></image>"
+msgstr ""
-#. biscq
+#. ikjGP
#: numbering_stop.xhp
msgctxt ""
"numbering_stop.xhp\n"
-"par_id3144511\n"
+"par_id781614327726646\n"
"help.text"
-msgid "If the cursor is located within a numbered or bulleted list, you can turn off automatic numbers or bullets for the current paragraph or selected paragraphs by clicking the <emph>Bullets On/Off </emph>icon on the <emph>Text Formatting</emph> bar."
-msgstr "当光标位于带编号或项目符号的列表中时,您可以通过点击「<emph>文字格式</emph>」栏上的「<emph>项目符号打开/关闭</emph>」图标,关闭当前段落或选中段落的自动编号或项目符号。"
+msgid "Toggle Unordered List icon"
+msgstr ""
-#. CfCjc
+#. RE37f
#: numbering_stop.xhp
msgctxt ""
"numbering_stop.xhp\n"
"par_id3148946\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">To remove numbering from a paragraph using the keyboard: </caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\">使用键盘删除段落中的编号: </caseinline></switchinline>"
+msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\"> To remove a number or bullet from a paragraph while preserving the list indenting: </caseinline></switchinline>"
+msgstr ""
-#. qETFj
+#. EsxZF
#: numbering_stop.xhp
msgctxt ""
"numbering_stop.xhp\n"
"par_id3148663\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Place the cursor at the beginning of a numbered paragraph and press the Backspace key. </caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\">将光标置于编号段落的开始处,然后按「退格」键。</caseinline></switchinline>"
+msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Place the cursor at the beginning of a paragraph in a list and press the <keycode>Backspace</keycode> key. </caseinline></switchinline>"
+msgstr ""
#. TY7jM
#: numbering_stop.xhp
@@ -18691,6 +18700,15 @@ msgctxt ""
msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">The numbering of the paragraph disappears and is removed from the numbering sequence. Numbering resumes in the following paragraph. </caseinline></switchinline>"
msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\">段落的编号将消失并从编号序列中删除。在下一段落中重新开始编号。</caseinline></switchinline>"
+#. B8akd
+#: numbering_stop.xhp
+msgctxt ""
+"numbering_stop.xhp\n"
+"par_id911614326873271\n"
+"help.text"
+msgid "Press <keycode>Shift+Backspace</keycode> at the beginning of a list paragraph to return the number or bullet."
+msgstr ""
+
#. FrmUz
#: numbering_stop.xhp
msgctxt ""
@@ -23326,14 +23344,14 @@ msgctxt ""
msgid "If --convert-to is used more than once, last value of OutputFileExtension[:OutputFilterName] is effective. If --outdir is used more than once, only its last value is effective. For example:"
msgstr "如果多次使用「--convert-to」,则最后一个 OutputFileExtension[:OutputFilterName] 有效。如果多次使用「--outdir」,最后一次的值有效。例如:"
-#. ir37U
+#. RYx7a
#: start_parameters.xhp
msgctxt ""
"start_parameters.xhp\n"
"par_id781554408625219\n"
"help.text"
-msgid "See the <link href=\"text/shared/guide/convertfilters.xhp\" name=\"list of document filters\">list of document filters</link> for file conversion."
-msgstr "请参阅用于文件转换的<link href=\"text/shared/guide/convertfilters.xhp\" name=\"list of document filters\">文档筛选器列表</link>。"
+msgid "<variable id=\"seefilters\">See the <link href=\"text/shared/guide/convertfilters.xhp\" name=\"list of document filters\">list of document filters</link> for file conversion.</variable>"
+msgstr ""
#. EiUnD
#: start_parameters.xhp
@@ -23929,13 +23947,13 @@ msgctxt ""
msgid "If you want to change the settings of your default tab stops, you will find further information under <switchinline select=\"appl\"><caseinline select=\"WRITER\"><link href=\"text/shared/optionen/01040900.xhp\" name=\"Text Document - General\">%PRODUCTNAME Writer - General</link></caseinline><caseinline select=\"CALC\"><link href=\"text/shared/optionen/01060300.xhp\" name=\"Spreadsheet - General\">%PRODUCTNAME Calc - General</link></caseinline><caseinline select=\"DRAW\"><link href=\"text/shared/optionen/01070500.xhp\" name=\"Drawing - General\">%PRODUCTNAME Draw - General</link></caseinline><caseinline select=\"IMPRESS\"><link href=\"text/shared/optionen/01070500.xhp\" name=\"Presentation - General\">%PRODUCTNAME Impress - General</link></caseinline><defaultinline>(module name) - General</defaultinline></switchinline> in the Options dialog box."
msgstr "如果要更改默认制表位设置,可以在「选项」对话框的<switchinline select=\"appl\"><caseinline select=\"WRITER\"><link href=\"text/shared/optionen/01040900.xhp\" name=\"Text Document - General\">%PRODUCTNAME Writer - 常规</link></caseinline><caseinline select=\"CALC\"><link href=\"text/shared/optionen/01060300.xhp\" name=\"Spreadsheet - General\">%PRODUCTNAME Calc - 常规</link></caseinline><caseinline select=\"DRAW\"><link href=\"text/shared/optionen/01070500.xhp\" name=\"Drawing - General\">%PRODUCTNAME Draw - 常规</link></caseinline><caseinline select=\"IMPRESS\"><link href=\"text/shared/optionen/01070500.xhp\" name=\"Presentation - General\">%PRODUCTNAME Impress - 常规</link></caseinline><defaultinline>(模块名称) - 常规</defaultinline></switchinline>下找到更多信息。"
-#. hqPQR
+#. hA4kf
#: tabs.xhp
msgctxt ""
"tabs.xhp\n"
"par_id3146972\n"
"help.text"
-msgid "The <link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">context menu</link> of the ruler allows you to change the displayed units of measurement. These changes are only valid until you exit $[officename], and they only apply to the ruler on whose context menu you made the change. If you want to change the ruler measurement units permanently, choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - [Document type] - View</menuitem> and change the measurement unit there."
+msgid "The <link href=\"text/shared/00/00000001.xhp#contextmenu\" name=\"context menu\">context menu</link> of the ruler allows you to change the displayed units of measurement. These changes are only valid until you exit $[officename], and they only apply to the ruler on whose context menu you made the change. If you want to change the ruler measurement units permanently, choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - [Document type] - View</menuitem> and change the measurement unit there."
msgstr ""
#. ojDwN
diff --git a/source/zh-CN/helpcontent2/source/text/shared/optionen.po b/source/zh-CN/helpcontent2/source/text/shared/optionen.po
index 3c315beb357..44e76eb39a1 100644
--- a/source/zh-CN/helpcontent2/source/text/shared/optionen.po
+++ b/source/zh-CN/helpcontent2/source/text/shared/optionen.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-02-17 15:59+0100\n"
+"POT-Creation-Date: 2021-03-19 17:31+0100\n"
"PO-Revision-Date: 2021-01-15 20:36+0000\n"
"Last-Translator: Petro Ding <petroenk@outlook.com>\n"
"Language-Team: Chinese (Simplified) <https://translations.documentfoundation.org/projects/libo_help-master/textsharedoptionen/zh_Hans/>\n"
@@ -6145,23 +6145,23 @@ msgctxt ""
msgid "List"
msgstr "列表"
-#. AcAJa
+#. sEbwG
#: 01040300.xhp
msgctxt ""
"01040300.xhp\n"
"par_id3144433\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/optfonttabpage/listbox\">Specifies the fonts for lists and numbering and all derived styles.</ahelp>"
-msgstr "<ahelp hid=\"modules/swriter/ui/optfonttabpage/listbox\">指定列表 (项目符号与编号) 样式使用的字体。</ahelp>"
+msgid "<ahelp hid=\"modules/swriter/ui/optfonttabpage/listbox\">Specifies the font and font size for the <emph>List</emph> paragraph style, which is inherited by all derived paragraph styles.</ahelp>"
+msgstr ""
-#. KnLN9
+#. aQFY4
#: 01040300.xhp
msgctxt ""
"01040300.xhp\n"
"par_id3150767\n"
"help.text"
-msgid "When you choose <switchinline select=\"appl\"><caseinline select=\"WRITER\"><link href=\"text/shared/01/06050000.xhp\" name=\"Format - Numbering/Bullets\"><emph>Format - Numbering/Bullets</emph></link></caseinline><defaultinline><emph>Format - Numbering/Bullets</emph></defaultinline></switchinline> to format a paragraph with numbers or bullets in a text document, the program assigns these Paragraph Styles automatically."
-msgstr "当您使用 <switchinline select=\"appl\"><caseinline select=\"WRITER\"><link href=\"text/shared/01/06050000.xhp\" name=\"Format - Numbering/Bullets\"><emph>格式 - 项目符号与编号</emph></link></caseinline><defaultinline><emph>格式 - 项目符号与编号</emph></defaultinline></switchinline> 来格式化文本文档中包含项目符号与编号的段落时,程序将自动应用这些段落样式。"
+msgid "When you choose <switchinline select=\"appl\"><caseinline select=\"WRITER\"><link href=\"text/shared/01/06050000.xhp\" name=\"Format - Numbering/Bullets\"><menuitem>Format - Bullets and Numbering</menuitem></link></caseinline><defaultinline><menuitem>Format - Bullets and Numbering</menuitem></defaultinline></switchinline> to format a paragraph with numbers or bullets in a text document, the program assigns these Paragraph Styles automatically."
+msgstr ""
#. 3nSZ5
#: 01040300.xhp
@@ -6235,13 +6235,13 @@ msgctxt ""
msgid "<ahelp hid=\"modules/swriter/ui/printoptionspage/PrintOptionsPage\">Specifies print settings within a text or HTML document.</ahelp>"
msgstr "<ahelp hid=\"modules/swriter/ui/printoptionspage/PrintOptionsPage\">指定文本文档或HTML文档中的打印设置。</ahelp>"
-#. m2BYE
+#. rwhVS
#: 01040400.xhp
msgctxt ""
"01040400.xhp\n"
"par_id3153542\n"
"help.text"
-msgid "The print settings defined on this tab page apply to all subsequent print jobs, until you change the settings again. If you want to change the settings for the current print job only, use the <menuitem>File - Print</menuitem> dialog."
+msgid "The print settings defined on this tab page apply to subsequent new documents, until you change the settings again. If you want to change the settings for the current print job only, use the <menuitem>File - Print</menuitem> dialog."
msgstr ""
#. kHkS3
@@ -15919,6 +15919,15 @@ msgctxt ""
msgid "Java options"
msgstr "Java 选项"
+#. BYguG
+#: java.xhp
+msgctxt ""
+"java.xhp\n"
+"par_id181614855578590\n"
+"help.text"
+msgid "The current list of %PRODUCTNAME modules and resources that depends on Java is available <link href=\"https://wiki.documentfoundation.org/Faq/General/015\" name=\"Java wiki\">in the wiki</link>."
+msgstr ""
+
#. J8Yfv
#: java.xhp
msgctxt ""
@@ -15937,6 +15946,15 @@ msgctxt ""
msgid "<ahelp hid=\"cui/ui/optadvancedpage/javaenabled\">Allows you to run Java applications in %PRODUCTNAME.</ahelp> When a Java application attempts to access your hard drive, a prompt opens."
msgstr "<ahelp hid=\"cui/ui/optadvancedpage/javaenabled\">允许您在 %PRODUCTNAME 中运行 Java 应用程序。</ahelp>当 Java 应用程序试图访问您的硬盘时,会出现一则提示。"
+#. JLKwC
+#: java.xhp
+msgctxt ""
+"java.xhp\n"
+"par_id881614855922649\n"
+"help.text"
+msgid "Make sure to install a JRE compatible with the %PRODUCTNAME architecture: 64-bit JRE for 64-bit %PRODUCTNAME and 32-bit JRE for 32-bit %PRODUCTNAME."
+msgstr ""
+
#. BBqDy
#: java.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/simpress.po b/source/zh-CN/helpcontent2/source/text/simpress.po
index 115393ef61f..c8005173845 100644
--- a/source/zh-CN/helpcontent2/source/text/simpress.po
+++ b/source/zh-CN/helpcontent2/source/text/simpress.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-10-27 12:31+0100\n"
+"POT-Creation-Date: 2021-03-19 17:31+0100\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"
@@ -1555,6 +1555,24 @@ msgctxt ""
msgid "<ahelp hid=\".\">Contains commands for formatting the layout and the contents of your document.</ahelp>"
msgstr "<ahelp hid=\".\">包含用于格式化文档版式和内容的命令。</ahelp>"
+#. vmbqC
+#: main_format.xhp
+msgctxt ""
+"main_format.xhp\n"
+"hd_id451615217475502\n"
+"help.text"
+msgid "Styles"
+msgstr ""
+
+#. bpU6u
+#: main_format.xhp
+msgctxt ""
+"main_format.xhp\n"
+"par_id41615217505414\n"
+"help.text"
+msgid "Shows commands to edit, update, create, and manage styles."
+msgstr ""
+
#. CJJ22
#: main_format.xhp
msgctxt ""
@@ -1582,59 +1600,41 @@ msgctxt ""
msgid "<link href=\"text/shared/01/06050000.xhp\" name=\"Numbering/Bullets\">Bullets and Numbering</link>"
msgstr "<link href=\"text/shared/01/06050000.xhp\" name=\"Numbering/Bullets\">项目符号与编号</link>"
-#. TVJ8F
+#. LnFgm
#: main_format.xhp
msgctxt ""
"main_format.xhp\n"
-"hd_id3149499\n"
+"hd_id801615217485302\n"
"help.text"
-msgid "<link href=\"text/shared/01/05230000.xhp\" name=\"Position and Size\">Object and Shape</link>"
+msgid "Table"
msgstr ""
-#. XrW2e
+#. ZH8Cz
#: main_format.xhp
msgctxt ""
"main_format.xhp\n"
-"hd_id3154510\n"
+"par_id61615217563797\n"
"help.text"
-msgid "<link href=\"text/shared/01/05200000.xhp\" name=\"Line\">Line</link>"
-msgstr "<link href=\"text/shared/01/05200000.xhp\" name=\"Line\">线条</link>"
-
-#. wt8hF
-#: main_format.xhp
-msgctxt ""
-"main_format.xhp\n"
-"hd_id3149021\n"
-"help.text"
-msgid "<link href=\"text/shared/01/05210000.xhp\" name=\"Area\">Area</link>"
-msgstr "<link href=\"text/shared/01/05210000.xhp\" name=\"Area\">区域</link>"
-
-#. VkWBC
-#: main_format.xhp
-msgctxt ""
-"main_format.xhp\n"
-"hd_id3155961\n"
-"help.text"
-msgid "<link href=\"text/shared/01/05990000.xhp\" name=\"Text\">Text</link>"
-msgstr "<link href=\"text/shared/01/05990000.xhp\" name=\"Text\">文本</link>"
+msgid "Shows commands to format, edit, and delete a table and its elements."
+msgstr ""
-#. nGRHD
+#. iZgpC
#: main_format.xhp
msgctxt ""
"main_format.xhp\n"
-"hd_id3156286\n"
+"hd_id401615217493429\n"
"help.text"
-msgid "<link href=\"text/simpress/01/05120000.xhp\" name=\"Page Layout...\">Slide Design</link>"
-msgstr "<link href=\"text/simpress/01/05120000.xhp\" name=\"Page Layout...\">幻灯片设计</link>"
+msgid "Image"
+msgstr ""
-#. MwAqP
+#. RNZjn
#: main_format.xhp
msgctxt ""
"main_format.xhp\n"
-"hd_id3163827\n"
+"par_id901615217674598\n"
"help.text"
-msgid "<link href=\"text/simpress/01/05130000.xhp\" name=\"Modify Layout\">Slide Layout</link>"
-msgstr "<link href=\"text/simpress/01/05130000.xhp\" name=\"Modify Layout\">幻灯片版式</link>"
+msgid "Shows commands to crop, edit, and manage images."
+msgstr ""
#. F98f9
#: main_slide.xhp
@@ -1663,23 +1663,392 @@ msgctxt ""
msgid "This menu provides slide management and navigation commands."
msgstr "此菜单包含了用于管理和导航幻灯片的命令。"
-#. qN8UF
+#. XaqGZ
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id611615489755701\n"
+"help.text"
+msgid "Duplicate Slide"
+msgstr ""
+
+#. uJcAM
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id71615490370664\n"
+"help.text"
+msgid "Creates a copy of the currently selected slide."
+msgstr ""
+
+#. Jtf2o
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id631615489785082\n"
+"help.text"
+msgid "Delete Slide"
+msgstr ""
+
+#. FAJJ6
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id841615491193340\n"
+"help.text"
+msgid "Deletes the selected slide(s)."
+msgstr ""
+
+#. iZWVK
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id721615489786162\n"
+"help.text"
+msgid "Save Background Image"
+msgstr ""
+
+#. 8ydAh
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id841615491449943\n"
+"help.text"
+msgid "If the slide has a background image, this option allows the user to save the corresponding background image file."
+msgstr ""
+
+#. Bhh37
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id161615489786339\n"
+"help.text"
+msgid "Set Background Image"
+msgstr ""
+
+#. ekbFN
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id781615491497404\n"
+"help.text"
+msgid "Opens a File Picker to choose an image file to be set as the background of the current slide."
+msgstr ""
+
+#. 92Pku
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id921615489787123\n"
+"help.text"
+msgid "New Master"
+msgstr ""
+
+#. kPJER
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id131615493790751\n"
+"help.text"
+msgid "Creates a new Master Slide. This function is only available in <emph>Master View</emph>."
+msgstr ""
+
+#. Vwom7
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id491615494190854\n"
+"help.text"
+msgid "To enter the Master View, go to <emph>View - Master Slide</emph>. To exit the Master View, go to <emph>View - Normal</emph>."
+msgstr ""
+
+#. HQQHh
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id421615489787299\n"
+"help.text"
+msgid "Delete Master"
+msgstr ""
+
+#. EBxxM
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id661615494028415\n"
+"help.text"
+msgid "Deletes the currently selected Master Slide. This function is only available in <emph>Master View</emph>"
+msgstr ""
+
+#. hXNB7
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id841615489787538\n"
+"help.text"
+msgid "Master Background"
+msgstr ""
+
+#. Kf3CF
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id921615494351365\n"
+"help.text"
+msgid "This option allows to show or hide the background image defined in the master slide."
+msgstr ""
+
+#. 9GSWp
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id621615489788132\n"
+"help.text"
+msgid "Master Objects"
+msgstr ""
+
+#. wjDcS
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id541615494644223\n"
+"help.text"
+msgid "This option allows to show or hide objects defined in the master slide."
+msgstr ""
+
+#. BVTEY
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id51615489788356\n"
+"help.text"
+msgid "Master Elements"
+msgstr ""
+
+#. GaTGo
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id111615494747246\n"
+"help.text"
+msgid "Displays a dialog box where the following elements from the master slide can be enabled or disabled:"
+msgstr ""
+
+#. fvE2V
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id41615494861841\n"
+"help.text"
+msgid "Header"
+msgstr ""
+
+#. xcmiq
#: main_slide.xhp
msgctxt ""
"main_slide.xhp\n"
-"hd_id3145801\n"
+"par_id321615494881187\n"
"help.text"
-msgid "<link href=\"text/simpress/01/new_slide.xhp\" name=\"New Slide\">New Slide</link>"
-msgstr "<link href=\"text/simpress/01/new_slide.xhp\" name=\"New Slide\">新建幻灯片</link>"
+msgid "Date/Time"
+msgstr ""
-#. BkUdP
+#. kfNdX
#: main_slide.xhp
msgctxt ""
"main_slide.xhp\n"
-"hd_id551556824896520\n"
+"par_id721615494891164\n"
"help.text"
-msgid "<link href=\"text/simpress/01/slide_properties.xhp\" name=\"Properties\">Properties</link>"
-msgstr "<link href=\"text/simpress/01/slide_properties.xhp\" name=\"Properties\">属性</link>"
+msgid "Footer"
+msgstr ""
+
+#. LLGmD
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id401615494904662\n"
+"help.text"
+msgid "Slide Number"
+msgstr ""
+
+#. sYXNP
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id851615489788586\n"
+"help.text"
+msgid "Show Slide"
+msgstr ""
+
+#. 6hQEB
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id321615495037553\n"
+"help.text"
+msgid "If a slide is hidden, this function makes it visible again."
+msgstr ""
+
+#. FFLV4
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id201615489788874\n"
+"help.text"
+msgid "Hide Slide"
+msgstr ""
+
+#. jdiSK
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id961615495104794\n"
+"help.text"
+msgid "If a slide is visible, this function hides it."
+msgstr ""
+
+#. nV23n
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id121615489789140\n"
+"help.text"
+msgid "Rename Slide"
+msgstr ""
+
+#. GpHBE
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id901615495187958\n"
+"help.text"
+msgid "Opens a dialog box where a name can be set for the current slide."
+msgstr ""
+
+#. D6GtH
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id551615489789347\n"
+"help.text"
+msgid "Jump to Last Edited Slide"
+msgstr ""
+
+#. Snoa6
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id741615495336473\n"
+"help.text"
+msgid "Navigates to the last edited slide in the document."
+msgstr ""
+
+#. FA3Ra
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id641615489789548\n"
+"help.text"
+msgid "Move"
+msgstr ""
+
+#. GBPvF
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id371615495363225\n"
+"help.text"
+msgid "Shows a list of move operations that can be applied to the current slide:"
+msgstr ""
+
+#. TF4iz
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id711615495448201\n"
+"help.text"
+msgid "<emph>Slide to Start:</emph> Moves the current slide to the first position."
+msgstr ""
+
+#. uAt25
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id101615495452464\n"
+"help.text"
+msgid "<emph>Slide Up:</emph> Moves the current slide one position up in the presentation."
+msgstr ""
+
+#. PdEMy
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id761615495456499\n"
+"help.text"
+msgid "<emph>Slide Down:</emph> Moves the current slide one position down in the presentation."
+msgstr ""
+
+#. ESDFM
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id321615495459372\n"
+"help.text"
+msgid "<emph>Slide to End:</emph> Moves the current slide to the last position."
+msgstr ""
+
+#. AsscG
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"hd_id301615489789755\n"
+"help.text"
+msgid "Navigate"
+msgstr ""
+
+#. 62VZA
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id941615558050553\n"
+"help.text"
+msgid "Shows a list of functions that can be used to navigate through the slides:"
+msgstr ""
+
+#. Mdi6Y
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id381615558169403\n"
+"help.text"
+msgid "<emph>To First Slide:</emph> Selects the first slide in the presentation."
+msgstr ""
+
+#. bYEak
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id131615558173437\n"
+"help.text"
+msgid "<emph>To Previous Slide:</emph> Navigates to the previous slide with respect to the currently selected slide."
+msgstr ""
+
+#. YXD3o
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id941615558176178\n"
+"help.text"
+msgid "<emph>To Next Slide:</emph> Navigates to the next slide with respect to the currently selected slide."
+msgstr ""
+
+#. dspAA
+#: main_slide.xhp
+msgctxt ""
+"main_slide.xhp\n"
+"par_id91615558179041\n"
+"help.text"
+msgid "<emph>To Last Slide:</emph> Selects the last slide in the presentation."
+msgstr ""
#. rCA2e
#: main_tools.xhp
@@ -1734,3 +2103,30 @@ msgctxt ""
"help.text"
msgid "<link href=\"text/shared/01/06140000.xhp\" name=\"Customize\">Customize</link>"
msgstr "<link href=\"text/shared/01/06140000.xhp\" name=\"Customize\">自定义</link>"
+
+#. oAFfK
+#: submenu_object_shape.xhp
+msgctxt ""
+"submenu_object_shape.xhp\n"
+"tit\n"
+"help.text"
+msgid "Object and Shape (Impress)"
+msgstr ""
+
+#. RHunz
+#: submenu_object_shape.xhp
+msgctxt ""
+"submenu_object_shape.xhp\n"
+"hd_id231615117568430\n"
+"help.text"
+msgid "<link href=\"text/simpress/submenu_object_shape.xhp\" name=\"Object and Shape\">Object and Shape</link>"
+msgstr ""
+
+#. HZBpz
+#: submenu_object_shape.xhp
+msgctxt ""
+"submenu_object_shape.xhp\n"
+"par_id111615131426235\n"
+"help.text"
+msgid "Opens a submenu to edit the properties of the selected object or shape."
+msgstr ""
diff --git a/source/zh-CN/helpcontent2/source/text/simpress/00.po b/source/zh-CN/helpcontent2/source/text/simpress/00.po
index b93a146246c..ffffd0ed457 100644
--- a/source/zh-CN/helpcontent2/source/text/simpress/00.po
+++ b/source/zh-CN/helpcontent2/source/text/simpress/00.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-11-03 12:43+0100\n"
+"POT-Creation-Date: 2021-03-19 17:31+0100\n"
"PO-Revision-Date: 2019-06-24 00:50+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1420,13 +1420,13 @@ msgctxt ""
msgid "<variable id=\"frtiteh\">Choose <menuitem>Slide - Slide Properties</menuitem> and then click the <emph>Background</emph> tab </variable>"
msgstr ""
-#. y5oEX
+#. fuqnR
#: slide_menu.xhp
msgctxt ""
"slide_menu.xhp\n"
"par_id3155266\n"
"help.text"
-msgid "<variable id=\"adnsei\">Choose <menuitem>Slide - Slide Layout</menuitem> </variable>"
+msgid "<variable id=\"adnsei\">Choose <menuitem>Slide - Layout</menuitem> </variable>"
msgstr ""
#. j5KeJ
diff --git a/source/zh-CN/helpcontent2/source/text/simpress/01.po b/source/zh-CN/helpcontent2/source/text/simpress/01.po
index 54dba04c7b5..652db405d5c 100644
--- a/source/zh-CN/helpcontent2/source/text/simpress/01.po
+++ b/source/zh-CN/helpcontent2/source/text/simpress/01.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-01-19 13:13+0100\n"
+"POT-Creation-Date: 2021-03-19 17:31+0100\n"
"PO-Revision-Date: 2020-02-18 14:15+0000\n"
"Last-Translator: Adolfo Jayme Barrientos <fito@libreoffice.org>\n"
"Language-Team: Chinese (Simplified) <https://weblate.documentfoundation.org/projects/libo_help-master/textsimpress01/zh_Hans/>\n"
@@ -3220,14 +3220,14 @@ msgctxt ""
msgid "<link href=\"text/simpress/01/04140000.xhp\" name=\"Summary Slide\">Summary Slide</link>"
msgstr "<link href=\"text/simpress/01/04140000.xhp\" name=\"幻灯片摘要\">幻灯片摘要</link>"
-#. zGg5h
+#. sYR47
#: 04140000.xhp
msgctxt ""
"04140000.xhp\n"
"par_id3149664\n"
"help.text"
-msgid "<ahelp hid=\".uno:SummaryPage\" visibility=\"visible\">Creates a new slide that contains a bulleted list from the titles of the slides that follow the selected slide. The summary slide is inserted behind the last slide.</ahelp>"
-msgstr "<ahelp hid=\".uno:SummaryPage\" visibility=\"visible\">创建一个新幻灯片,其中含有由选中幻灯片之后的各个幻灯片标题形成的项目符号列表。幻灯片摘要插入到最后一张幻灯片之后。</ahelp>"
+msgid "<ahelp hid=\".uno:SummaryPage\" visibility=\"visible\">Creates a new slide that contains an unordered list from the titles of the slides that follow the selected slide. The summary slide is inserted behind the last slide.</ahelp>"
+msgstr ""
#. jvuJN
#: 04990000.xhp
@@ -4147,14 +4147,14 @@ msgctxt ""
msgid "Delete Column"
msgstr "删除列"
-#. qrDGC
+#. Luyeg
#: 05130000.xhp
msgctxt ""
"05130000.xhp\n"
"tit\n"
"help.text"
-msgid "Slide Layout"
-msgstr "幻灯片版式"
+msgid "Layout"
+msgstr ""
#. HJ8Jm
#: 05130000.xhp
@@ -4165,23 +4165,23 @@ msgctxt ""
msgid "<bookmark_value>changing; slide layouts</bookmark_value> <bookmark_value>slide layouts</bookmark_value>"
msgstr "<bookmark_value>更改; 幻灯片版式</bookmark_value> <bookmark_value>幻灯片版式</bookmark_value>"
-#. REe2P
+#. 4dvDP
#: 05130000.xhp
msgctxt ""
"05130000.xhp\n"
"hd_id3154754\n"
"help.text"
-msgid "Slide Layout"
-msgstr "幻灯片版式"
+msgid "<link href=\"text/simpress/01/05130000.xhp\" name=\"Layout\">Layout</link>"
+msgstr ""
-#. dmgco
+#. dZ3GJ
#: 05130000.xhp
msgctxt ""
"05130000.xhp\n"
"par_id3149126\n"
"help.text"
-msgid "<variable id=\"seite\"><ahelp hid=\".uno:ModifyPage\">Opens a submenu with slide layouts.</ahelp> </variable>"
-msgstr "<variable id=\"seite\"><ahelp hid=\".uno:ModifyPage\">打开子菜单,可修改幻灯片版式。</ahelp> </variable>"
+msgid "<variable id=\"seite\"><ahelp hid=\".uno:ModifyPage\">Opens a submenu with slide layouts.</ahelp></variable>"
+msgstr ""
#. CFkTY
#: 05130000.xhp
@@ -9007,23 +9007,23 @@ msgctxt ""
msgid "Click <emph>Remove Client Authorization</emph>."
msgstr "按下「<emph>移除客户端身份认证</emph>」按钮。"
-#. 7oZpm
+#. hTau2
#: slide_properties.xhp
msgctxt ""
"slide_properties.xhp\n"
"tit\n"
"help.text"
-msgid "Slide"
-msgstr "幻灯片"
+msgid "Slide Properties"
+msgstr ""
-#. baLrD
+#. PGY7f
#: slide_properties.xhp
msgctxt ""
"slide_properties.xhp\n"
"hd_id3149379\n"
"help.text"
-msgid "Slide"
-msgstr "幻灯片"
+msgid "Slide Properties"
+msgstr ""
#. YMWN6
#: slide_properties.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/simpress/guide.po b/source/zh-CN/helpcontent2/source/text/simpress/guide.po
index 7923f1061c5..de1f996d9dd 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-02-17 15:59+0100\n"
+"POT-Creation-Date: 2021-03-23 11:45+0100\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"
@@ -2761,13 +2761,31 @@ msgctxt ""
msgid "During a Slide Show"
msgstr "幻灯片放映过程中"
-#. DaXcL
+#. aonrJ
+#: keyboard.xhp
+msgctxt ""
+"keyboard.xhp\n"
+"hd_id941616435513490\n"
+"help.text"
+msgid "To start a Slide Show"
+msgstr ""
+
+#. 3vhZG
#: keyboard.xhp
msgctxt ""
"keyboard.xhp\n"
"par_id3150650\n"
"help.text"
-msgid "To start a slide show, press <switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+F2</keycode> or <keycode>F5</keycode>."
+msgid "To start a slide show from the begining, press <keycode>F5</keycode>."
+msgstr ""
+
+#. WaqYV
+#: keyboard.xhp
+msgctxt ""
+"keyboard.xhp\n"
+"par_id911616435506012\n"
+"help.text"
+msgid "To start a slide show from the current slide, press <keycode>Shift+F5</keycode>."
msgstr ""
#. K3r3c
@@ -4165,32 +4183,32 @@ msgctxt ""
msgid "<link href=\"text/simpress/02/10030200.xhp\" name=\"Glue points\">Glue points</link>"
msgstr "<link href=\"text/simpress/02/10030200.xhp\" name=\"粘结点\">粘结点</link>"
-#. GhgSf
+#. 3LhEr
#: page_copy.xhp
msgctxt ""
"page_copy.xhp\n"
"tit\n"
"help.text"
-msgid "Copying Slides From Other Presentations"
-msgstr "从其他演示文稿中复制幻灯片"
+msgid "Insert Slide from File"
+msgstr ""
-#. BEQux
+#. 34kPB
#: page_copy.xhp
msgctxt ""
"page_copy.xhp\n"
"bm_id3146971\n"
"help.text"
-msgid "<bookmark_value>copying; slides</bookmark_value><bookmark_value>slides; copying between documents</bookmark_value><bookmark_value>pages; copying</bookmark_value><bookmark_value>inserting; slides from files</bookmark_value><bookmark_value>pasting;slides from other presentations</bookmark_value>"
-msgstr "<bookmark_value>复制; 幻灯片</bookmark_value><bookmark_value>幻灯片; 在文档之间复制</bookmark_value><bookmark_value>页面; 复制</bookmark_value><bookmark_value>插入; 文件中的幻灯片</bookmark_value><bookmark_value>粘贴; 其他演示文稿中的幻灯片</bookmark_value>"
+msgid "<bookmark_value>copying; slides</bookmark_value> <bookmark_value>slides; copying between documents</bookmark_value> <bookmark_value>pages; copying</bookmark_value> <bookmark_value>inserting; slides from files</bookmark_value> <bookmark_value>pasting;slides from other presentations</bookmark_value>"
+msgstr ""
-#. paiDj
+#. BCJDc
#: page_copy.xhp
msgctxt ""
"page_copy.xhp\n"
"hd_id3146971\n"
"help.text"
-msgid "<variable id=\"page_copy\"><link href=\"text/simpress/guide/page_copy.xhp\" name=\"Copying Slides From Other Presentations\">Copying Slides From Other Presentations</link></variable>"
-msgstr "<variable id=\"page_copy\"><link href=\"text/simpress/guide/page_copy.xhp\" name=\"复制其他演示文稿中的幻灯片\">复制其他演示文稿中的幻灯片</link></variable>"
+msgid "<variable id=\"page_copy\"><link href=\"text/simpress/guide/page_copy.xhp\" name=\"Copying Slides From Other Presentations\">Insert Slide from File</link></variable>"
+msgstr ""
#. BNyAE
#: page_copy.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/smath/01.po b/source/zh-CN/helpcontent2/source/text/smath/01.po
index 887b891c6c2..ed5d11a8cc0 100644
--- a/source/zh-CN/helpcontent2/source/text/smath/01.po
+++ b/source/zh-CN/helpcontent2/source/text/smath/01.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-10-27 12:31+0100\n"
+"POT-Creation-Date: 2021-03-19 17:31+0100\n"
"PO-Revision-Date: 2019-07-10 04:02+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -205,14 +205,14 @@ msgctxt ""
msgid "<link href=\"text/smath/01/03040000.xhp\" name=\"Zoom In\">Zoom In</link>"
msgstr "<link href=\"text/smath/01/03040000.xhp\" name=\"放大\">放大</link>"
-#. oeXhg
+#. 4GCbo
#: 03040000.xhp
msgctxt ""
"03040000.xhp\n"
"par_id3154490\n"
"help.text"
-msgid "<ahelp hid=\".\">Increases the display scale of the formula by 25%.</ahelp> The current zoom factor is displayed on the status bar. A selection of available zoom options is accessible through the <link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">context menu</link>. The context menu in the work area also contains zoom commands."
-msgstr "<ahelp hid=\".\">将公式的显示比例增加 25%。</ahelp>缩放比例在状态栏中显示。您也可以在状态栏的<link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">右键菜单</link>中修改此比例。工作空间的右键菜单中也包含缩放选项。"
+msgid "<ahelp hid=\".\">Increases the display scale of the formula by 25%.</ahelp> The current zoom factor is displayed on the status bar. A selection of available zoom options is accessible through the <link href=\"text/shared/00/00000001.xhp#contextmenu\" name=\"context menu\">context menu</link>. The context menu in the work area also contains zoom commands."
+msgstr ""
#. EyasV
#: 03050000.xhp
@@ -241,14 +241,14 @@ msgctxt ""
msgid "<link href=\"text/smath/01/03050000.xhp\" name=\"Zoom Out\">Zoom Out</link>"
msgstr "<link href=\"text/smath/01/03050000.xhp\" name=\"缩小\">缩小</link>"
-#. Q2ZAD
+#. yxSWi
#: 03050000.xhp
msgctxt ""
"03050000.xhp\n"
"par_id3150249\n"
"help.text"
-msgid "<ahelp hid=\".\">Decreases the display scale of formulas by 25%.</ahelp> The current zoom factor is displayed on the status bar. A selection of available zoom options is accessible through the <link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">context menu</link>. The context menu in the work area also contains zoom commands."
-msgstr "<ahelp hid=\".\">将公式的显示比例减小 25%。</ahelp>缩放比例在状态栏中显示。您也可以在状态栏的<link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">右键菜单</link>中修改此比例。工作空间的右键菜单中同样具有缩放选项。"
+msgid "<ahelp hid=\".\">Decreases the display scale of formulas by 25%.</ahelp> The current zoom factor is displayed on the status bar. A selection of available zoom options is accessible through the <link href=\"text/shared/00/00000001.xhp#contextmenu\" name=\"context menu\">context menu</link>. The context menu in the work area also contains zoom commands."
+msgstr ""
#. xSbDA
#: 03060000.xhp
@@ -277,14 +277,14 @@ msgctxt ""
msgid "<link href=\"text/smath/01/03060000.xhp\" name=\"Show All\">Show All</link>"
msgstr "<link href=\"text/smath/01/03060000.xhp\" name=\"Show All\">显示全部</link>"
-#. cMH92
+#. HGtyh
#: 03060000.xhp
msgctxt ""
"03060000.xhp\n"
"par_id3148571\n"
"help.text"
-msgid "<ahelp hid=\".\">Displays the entire formula in the maximum size possible so that all elements are included. The formula is reduced or enlarged so that all formula elements can be displayed in the work area.</ahelp> The current zoom factor is displayed on the status bar. A selection of available zoom options is accessible through the <link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">context menu</link>. The context menu in the work area also contains zoom commands. The zoom commands and icons are only available in Math documents, not for embedded Math objects."
-msgstr "<ahelp hid=\".\">以可能的最大尺寸显示整个公式,以便包含所有的元素。公式会被缩小或放大,使得所有的公式元素都可以显示在工作空间中。</ahelp>当前缩放比例显示在状态栏。「<link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">右键菜单</link>」提供了一些可用的缩放选项。工作区域的右键菜单也提供缩放命令。缩放命令与图标只在 Math 文档中可用,不适用于嵌入的 Math 对象。"
+msgid "<ahelp hid=\".\">Displays the entire formula in the maximum size possible so that all elements are included. The formula is reduced or enlarged so that all formula elements can be displayed in the work area.</ahelp> The current zoom factor is displayed on the status bar. A selection of available zoom options is accessible through the <link href=\"text/shared/00/00000001.xhp#contextmenu\" name=\"context menu\">context menu</link>. The context menu in the work area also contains zoom commands. The zoom commands and icons are only available in Math documents, not for embedded Math objects."
+msgstr ""
#. WGriM
#: 03070000.xhp
@@ -457,14 +457,14 @@ msgctxt ""
msgid "<link href=\"text/smath/01/03090100.xhp\" name=\"Unary/Binary Operators\">Unary/Binary Operators</link>"
msgstr "<link href=\"text/smath/01/03090100.xhp\" name=\"一元/二元运算符\">一元/二元运算符</link>"
-#. JBpRR
+#. T3SNE
#: 03090100.xhp
msgctxt ""
"03090100.xhp\n"
"par_id3151241\n"
"help.text"
-msgid "You can choose various unary and binary operators to build your $[officename] Math formula. Unary refers to operators that affect one placeholder. Binary refers to operators that connect two placeholders. The lower area of the Elements pane displays the individual operators. The <link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">context menu</link> of the <emph>Commands</emph> window also contains a list of these operators, as well as additional operators. If you need an operator that is not contained in the Elements pane, use the context menu or type it directly in the <emph>Commands</emph> window."
-msgstr "您可以选择各种一元和二元运算符来构建 $[officename] Math 公式。一元指的是影响一个占位符的运算符。二元指的是连接两个占位符的运算符。「公式元素」面板下方区域显示了各个运算符。「命令」窗口的<link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">右键菜单</link><emph>也包含了这些运算符的列表以及其他运算符。如果您需要使用「公式元素</emph>」面板中未包含的运算符,请使用右键菜单或直接在「<emph>命令</emph>」窗口中输入该运算符。"
+msgid "You can choose various unary and binary operators to build your $[officename] Math formula. Unary refers to operators that affect one placeholder. Binary refers to operators that connect two placeholders. The lower area of the Elements pane displays the individual operators. The <link href=\"text/shared/00/00000001.xhp#contextmenu\" name=\"context menu\">context menu</link> of the <emph>Commands</emph> window also contains a list of these operators, as well as additional operators. If you need an operator that is not contained in the Elements pane, use the context menu or type it directly in the <emph>Commands</emph> window."
+msgstr ""
#. 86s5i
#: 03090100.xhp
@@ -1933,14 +1933,14 @@ msgctxt ""
msgid "<link href=\"text/smath/01/03090300.xhp\" name=\"Operators\">Operators</link>"
msgstr "<link href=\"text/smath/01/03090300.xhp\" name=\"运算符\">运算符</link>"
-#. 9GqEF
+#. fJzeE
#: 03090300.xhp
msgctxt ""
"03090300.xhp\n"
"par_id3149755\n"
"help.text"
-msgid "You can choose among various operators to structure your <emph>$[officename] Math</emph> formula. All available operators appear in the lower part of the Elements pane. They are also listed in the <link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">context menu</link> of the <emph>Commands</emph> window. All operators not contained in the Elements pane or in the context menu must be typed manually in the <emph>Commands</emph> window."
-msgstr "您可以在多种运算符中进行选择以构建「<emph>$[officename] Math</emph>」公式。所有可用运算符均会显示在「公式元素」面板的下方区域中。它们也会在「命令」窗口的<link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">右键菜单</link>中列出。所有未包含在「<emph>公式元素</emph>」面板或右键菜单中的运算符,均必须在「<emph>命令</emph>」窗口中手动输入。"
+msgid "You can choose among various operators to structure your <emph>$[officename] Math</emph> formula. All available operators appear in the lower part of the Elements pane. They are also listed in the <link href=\"text/shared/00/00000001.xhp#contextmenu\" name=\"context menu\">context menu</link> of the <emph>Commands</emph> window. All operators not contained in the Elements pane or in the context menu must be typed manually in the <emph>Commands</emph> window."
+msgstr ""
#. hDyQo
#: 03090300.xhp
@@ -2392,14 +2392,14 @@ msgctxt ""
msgid "<link href=\"text/smath/01/03090400.xhp\" name=\"Functions\">Functions</link>"
msgstr "<link href=\"text/smath/01/03090400.xhp\" name=\"函数\">函数</link>"
-#. ELsLc
+#. Q9Kv7
#: 03090400.xhp
msgctxt ""
"03090400.xhp\n"
"par_id3155374\n"
"help.text"
-msgid "Choose a function in the lower part of the Elements pane. These functions are also listed in the <link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">context menu</link> of the <emph>Commands</emph> window. Any functions not contained in the Elements pane need to be typed manually in the Commands window."
-msgstr "在「元素」面板的下方区域选择一个函数。这些函数也会在「命令」窗口的<link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">右键菜单</link>中列出。所有未包含在「<emph>公式元素</emph>」面板中的函数均需要在「命令」窗口中手动输入。"
+msgid "Choose a function in the lower part of the Elements pane. These functions are also listed in the <link href=\"text/shared/00/00000001.xhp#contextmenu\" name=\"context menu\">context menu</link> of the <emph>Commands</emph> window. Any functions not contained in the Elements pane need to be typed manually in the Commands window."
+msgstr ""
#. 35FEB
#: 03090400.xhp
@@ -3139,14 +3139,14 @@ msgctxt ""
msgid "<link href=\"text/smath/01/03090500.xhp\" name=\"Brackets\">Brackets</link>"
msgstr "<link href=\"text/smath/01/03090500.xhp\" name=\"括号\">括号</link>"
-#. uHWGz
+#. EhUo8
#: 03090500.xhp
msgctxt ""
"03090500.xhp\n"
"par_id3147258\n"
"help.text"
-msgid "You can choose among various bracket types to structure a <emph>$[officename] Math</emph> formula. Bracket types are displayed in the lower part of the Elements pane. These brackets are also listed in the <link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">context menu</link> of the <emph>Commands</emph> window. All brackets that are not contained in the Elements pane or in the context menu can be typed manually in the <emph>Commands</emph> window."
-msgstr "您可以在多种括号类型中进行选择以构建「<emph>$[officename] Math</emph>」公式。括号类型显示在「公式元素」面板的下方区域中。这些括号也会在「命令」窗口的<link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">右键菜单</link>中列出。所有未包含在「<emph>公式元素</emph>」面板或右键菜单中的括号,均可以在「<emph>命令</emph>」窗口中手动输入。"
+msgid "You can choose among various bracket types to structure a <emph>$[officename] Math</emph> formula. Bracket types are displayed in the lower part of the Elements pane. These brackets are also listed in the <link href=\"text/shared/00/00000001.xhp#contextmenu\" name=\"context menu\">context menu</link> of the <emph>Commands</emph> window. All brackets that are not contained in the Elements pane or in the context menu can be typed manually in the <emph>Commands</emph> window."
+msgstr ""
#. zusZw
#: 03090500.xhp
@@ -3850,13 +3850,13 @@ msgctxt ""
msgid "<variable id=\"attributes\"><link href=\"text/smath/01/03090600.xhp\" name=\"Attributes\">Attributes</link> </variable>"
msgstr ""
-#. Q2dMs
+#. mFqph
#: 03090600.xhp
msgctxt ""
"03090600.xhp\n"
"par_id3145802\n"
"help.text"
-msgid "You can choose from various attributes for <emph>%PRODUCTNAME Math</emph> formulas. Some attributes are displayed in the lower part of the Elements pane. These attributes are also listed in the <link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">context menu</link> of the <emph>Commands</emph> window. All attributes not contained in the Elements pane or in the context menu must be typed manually in the <emph>Commands</emph> window."
+msgid "You can choose from various attributes for <emph>%PRODUCTNAME Math</emph> formulas. Some attributes are displayed in the lower part of the Elements pane. These attributes are also listed in the <link href=\"text/shared/00/00000001.xhp#contextmenu\" name=\"context menu\">context menu</link> of the <emph>Commands</emph> window. All attributes not contained in the Elements pane or in the context menu must be typed manually in the <emph>Commands</emph> window."
msgstr ""
#. LGFaf
@@ -4651,14 +4651,14 @@ msgctxt ""
msgid "<link href=\"text/smath/01/03090700.xhp\" name=\"Format\">Format</link>"
msgstr "<link href=\"text/smath/01/03090700.xhp\" name=\"格式\">格式</link>"
-#. dcihp
+#. ZG9A4
#: 03090700.xhp
msgctxt ""
"03090700.xhp\n"
"par_id3147262\n"
"help.text"
-msgid "You can choose among various options for formatting a $[officename] Math formula. The format options are displayed in the lower part of the Elements pane. These options are also listed in the <link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">context menu</link> of the <emph>Commands</emph> window."
-msgstr "在格式化 $[officename] Math 公式时,您可从各种选项中选择所需选项。格式选项显示在「公式元素」面板的下方区域。这些选项也会在「命令」窗口的<link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"右键菜单\">右键菜单</link><emph></emph>中列出。"
+msgid "You can choose among various options for formatting a $[officename] Math formula. The format options are displayed in the lower part of the Elements pane. These options are also listed in the <link href=\"text/shared/00/00000001.xhp#contextmenu\" name=\"context menu\">context menu</link> of the <emph>Commands</emph> window."
+msgstr ""
#. oGTCQ
#: 03090700.xhp
@@ -5254,14 +5254,14 @@ msgctxt ""
msgid "<link href=\"text/smath/01/03090800.xhp\" name=\"Set Operations\">Set Operations</link>"
msgstr "<link href=\"text/smath/01/03090800.xhp\" name=\"集合运算\">集合运算</link>"
-#. QzFc8
+#. X4op9
#: 03090800.xhp
msgctxt ""
"03090800.xhp\n"
"par_id3154641\n"
"help.text"
-msgid "Assign different set operators to the characters in your <emph>$[officename] Math</emph> formula. The individual operators are shown in the lower section of the Elements pane. Call the <link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">context menu</link> in the <emph>Commands</emph> window to see an identical list of the individual functions. Any operators not found in the Elements pane have to be entered directly in the Commands window. You can also directly insert other parts of the formula even if symbols already exist for them."
-msgstr "为「<emph>$[officename] Math</emph>」公式中的字符指定其他集合运算符。个别运算符显示在「公式元素」窗口的下方区域。可调用「命令」窗口中的<link href=\"text/shared/00/00000001.xhp#kontextmenue\" name=\"context menu\">右键菜单</link>查看各个函数的相同列表。未在「公式元素」面板中找到的运算符,必须在「<emph>命令</emph>」窗口中直接输入。您也可以直接插入公式的其他部分,即使这些部分的符号已经存在。"
+msgid "Assign different set operators to the characters in your <emph>$[officename] Math</emph> formula. The individual operators are shown in the lower section of the Elements pane. Call the <link href=\"text/shared/00/00000001.xhp#contextmenu\" name=\"context menu\">context menu</link> in the <emph>Commands</emph> window to see an identical list of the individual functions. Any operators not found in the Elements pane have to be entered directly in the Commands window. You can also directly insert other parts of the formula even if symbols already exist for them."
+msgstr ""
#. CJVPF
#: 03090800.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/swriter.po b/source/zh-CN/helpcontent2/source/text/swriter.po
index 208a95289f5..cca3e6c3bb0 100644
--- a/source/zh-CN/helpcontent2/source/text/swriter.po
+++ b/source/zh-CN/helpcontent2/source/text/swriter.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-02-17 15:59+0100\n"
+"POT-Creation-Date: 2021-03-19 17:31+0100\n"
"PO-Revision-Date: 2020-08-03 21:35+0000\n"
"Last-Translator: Ming Hua <plateauwolf@qq.com>\n"
"Language-Team: Chinese (Simplified) <https://weblate.documentfoundation.org/projects/libo_help-master/textswriter/zh_Hans/>\n"
@@ -1060,13 +1060,13 @@ msgctxt ""
msgid "<ahelp hid=\".uno:FormatMenu\">Contains commands for formatting the layout and the contents of your document.</ahelp>"
msgstr "<ahelp hid=\".uno:FormatMenu\">包含用于格式化文档的布局以及内容的命令。</ahelp>"
-#. dWAnk
+#. zjGX9
#: main0105.xhp
msgctxt ""
"main0105.xhp\n"
"hd_id551602974854459\n"
"help.text"
-msgid "Align"
+msgid "Align Text"
msgstr ""
#. 7FD3V
@@ -1078,41 +1078,41 @@ msgctxt ""
msgid "Opens a submenu where you can align text and objects."
msgstr ""
-#. 7iyia
+#. 5EJHh
#: main0105.xhp
msgctxt ""
"main0105.xhp\n"
-"hd_id951602975070826\n"
+"hd_id3147261\n"
"help.text"
-msgid "Lists"
-msgstr ""
+msgid "<link href=\"text/shared/01/05020000.xhp\" name=\"Character\">Character</link>"
+msgstr "<link href=\"text/shared/01/05020000.xhp\" name=\"Character\">字符</link>"
-#. SkZuS
+#. y8Ux2
#: main0105.xhp
msgctxt ""
"main0105.xhp\n"
-"par_id461602975083850\n"
+"hd_id3147286\n"
"help.text"
-msgid "Opens a submenu where you can modify the structure of numbered and bulleted paragraphs."
-msgstr ""
+msgid "<link href=\"text/shared/01/05030000.xhp\" name=\"Paragraph\">Paragraph</link>"
+msgstr "<link href=\"text/shared/01/05030000.xhp\" name=\"Paragraph\">段落</link>"
-#. 5EJHh
+#. 7iyia
#: main0105.xhp
msgctxt ""
"main0105.xhp\n"
-"hd_id3147261\n"
+"hd_id951602975070826\n"
"help.text"
-msgid "<link href=\"text/shared/01/05020000.xhp\" name=\"Character\">Character</link>"
-msgstr "<link href=\"text/shared/01/05020000.xhp\" name=\"Character\">字符</link>"
+msgid "Lists"
+msgstr ""
-#. y8Ux2
+#. MKjWR
#: main0105.xhp
msgctxt ""
"main0105.xhp\n"
-"hd_id3147286\n"
+"par_id461602975083850\n"
"help.text"
-msgid "<link href=\"text/shared/01/05030000.xhp\" name=\"Paragraph\">Paragraph</link>"
-msgstr "<link href=\"text/shared/01/05030000.xhp\" name=\"Paragraph\">段落</link>"
+msgid "Opens a submenu where you can modify the formatting of list paragraphs."
+msgstr ""
#. gYqLC
#: main0105.xhp
@@ -1132,13 +1132,13 @@ msgctxt ""
msgid "Title Page"
msgstr ""
-#. DyKLQ
+#. crAFH
#: main0105.xhp
msgctxt ""
"main0105.xhp\n"
"par_id471602976213270\n"
"help.text"
-msgid "Opens submenu where you can design a title page."
+msgid "Opens a dialog where you can design a title page."
msgstr ""
#. QKypm
@@ -1168,13 +1168,13 @@ msgctxt ""
msgid "<link href=\"text/swriter/01/05040500.xhp\" name=\"Columns\">Columns</link>"
msgstr "<link href=\"text/swriter/01/05040500.xhp\" name=\"Columns\">分栏</link>"
-#. JThwL
+#. HtHdy
#: main0105.xhp
msgctxt ""
"main0105.xhp\n"
"hd_id11602979335965\n"
"help.text"
-msgid "Watermark"
+msgid "<link href=\"text/swriter/01/watermark.xhp\" name=\"Watermark\">Watermark</link>"
msgstr ""
#. QSMBC
@@ -1195,24 +1195,6 @@ msgctxt ""
msgid "<link href=\"text/swriter/01/05060000.xhp\" name=\"Image\">Image</link>"
msgstr "<link href=\"text/swriter/01/05060000.xhp\" name=\"Image\">图像</link>"
-#. fqUFz
-#: main0105.xhp
-msgctxt ""
-"main0105.xhp\n"
-"hd_id881602977324204\n"
-"help.text"
-msgid "Text Box and Shape"
-msgstr ""
-
-#. 5XtDF
-#: main0105.xhp
-msgctxt ""
-"main0105.xhp\n"
-"par_id451602977343955\n"
-"help.text"
-msgid "Opens a submenu to modify, position, shape, line, area, text attributes, and fontwork for a selected textbox or shape."
-msgstr ""
-
#. FUiBn
#: main0105.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/swriter/00.po b/source/zh-CN/helpcontent2/source/text/swriter/00.po
index 034da040aa1..8649dd7224f 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-02-22 17:17+0100\n"
+"POT-Creation-Date: 2021-03-23 11:45+0100\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"
@@ -1564,31 +1564,49 @@ msgctxt ""
msgid "Choose <menuitem>View - Styles</menuitem> (<switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline>) - choose Page Styles - open context menu for selected style - <emph>New/Modify</emph>."
msgstr ""
-#. JW9yE
+#. 4fpCB
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3154470\n"
"help.text"
-msgid "Choose <menuitem>Format - Paragraph - Outline & Numbering</menuitem> tab."
+msgid "Choose <menuitem>Format - Paragraph - Outline & List</menuitem> tab."
msgstr ""
-#. qWCzG
+#. q583F
+#: 00000405.xhp
+msgctxt ""
+"00000405.xhp\n"
+"par_id231616224233651\n"
+"help.text"
+msgid "Right-click a paragraph, choose <menuitem>Paragraph - Paragraph - Outline & List</menuitem> tab."
+msgstr ""
+
+#. ExS89
+#: 00000405.xhp
+msgctxt ""
+"00000405.xhp\n"
+"par_id41616224423602\n"
+"help.text"
+msgid "Right-click a paragraph, choose <menuitem>Paragraph - Edit Style - Outline & List</menuitem> tab."
+msgstr ""
+
+#. n5kFM
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3154413\n"
"help.text"
-msgid "Choose <menuitem>Styles - Edit Style - Outline & Numbering</menuitem> tab (Paragraph Styles)."
+msgid "Choose <menuitem>Styles - Edit Style - Outline & List</menuitem> tab (Paragraph Styles)."
msgstr ""
-#. 7GJUj
+#. oVPyS
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3147525\n"
"help.text"
-msgid "Choose <menuitem>View - Styles -</menuitem> open context menu <menuitem>Modify/New - Outline & Numbering</menuitem> tab (Paragraph Styles)."
+msgid "Choose <menuitem>View - Styles -</menuitem> open context menu <menuitem>Modify/New - List & Numbering</menuitem> tab (Paragraph Styles)."
msgstr ""
#. Rp3Q3
diff --git a/source/zh-CN/helpcontent2/source/text/swriter/01.po b/source/zh-CN/helpcontent2/source/text/swriter/01.po
index 7d109bceadc..c12766945e6 100644
--- a/source/zh-CN/helpcontent2/source/text/swriter/01.po
+++ b/source/zh-CN/helpcontent2/source/text/swriter/01.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-02-22 17:17+0100\n"
+"POT-Creation-Date: 2021-03-23 11:45+0100\n"
"PO-Revision-Date: 2019-07-10 04:02+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5380,13 +5380,13 @@ msgctxt ""
msgid "Name"
msgstr ""
-#. 3FwA8
+#. wsww3
#: 04040000.xhp
msgctxt ""
"04040000.xhp\n"
"par_id3155178\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/insertbookmark/bookmarks\">Type the name of the bookmark that you want to create. Then press <emph>Insert</emph>.</ahelp>"
+msgid "<ahelp hid=\"modules/swriter/ui/insertbookmark/bookmarks\">Type the name of the bookmark that you want to create. Then, click <emph>Insert</emph>.</ahelp>"
msgstr ""
#. s7rfA
@@ -12058,14 +12058,14 @@ msgctxt ""
msgid "<ahelp hid=\"modules/swriter/ui/tocindexpage/fromheadings\">Creates the index using outline levels. Paragraphs formatted with one of the predefined heading styles (Heading 1-10) are added to the index.</ahelp>"
msgstr ""
-#. XavFH
+#. RfKn4
#: 04120211.xhp
msgctxt ""
"04120211.xhp\n"
"par_id1209200804373840\n"
"help.text"
-msgid "You can also assign the outline levels in the <link href=\"text/swriter/01/05030800.xhp\">Outline & Numbering</link> tab page of the Format - Paragraph dialog."
-msgstr "您也可以在「格式」-「段落」对话框的<link href=\"text/swriter/01/05030800.xhp\">大纲 & 编号</link>选项卡页面中指定大纲级别。"
+msgid "You can also assign outline levels to paragraphs in the <link href=\"text/swriter/01/05030800.xhp\">Outline & List</link> tab page of the Format - Paragraph dialog."
+msgstr ""
#. y5UNJ
#: 04120211.xhp
@@ -16081,32 +16081,32 @@ msgctxt ""
msgid "<ahelp hid=\"modules/swriter/ui/dropcapspage/comboBOX_TEMPLATE\">Select the formatting style that you want to apply to the drop caps.</ahelp> To use the formatting style of the current paragraph, select [None]."
msgstr "<ahelp hid=\"modules/swriter/ui/dropcapspage/comboBOX_TEMPLATE\">选择首字下沉要应用的格式样式。</ahelp>如果应用当前段落的格式样式,请选择「无」。"
-#. 24MpG
+#. nWCDv
#: 05030800.xhp
msgctxt ""
"05030800.xhp\n"
"tit\n"
"help.text"
-msgid "Outline & Numbering"
-msgstr "大纲 & 编号"
+msgid "Outline & List"
+msgstr ""
-#. muqGR
+#. Nprja
#: 05030800.xhp
msgctxt ""
"05030800.xhp\n"
"hd_id3151173\n"
"help.text"
-msgid "<link href=\"text/swriter/01/05030800.xhp\" name=\"Numbering\">Outline & Numbering</link>"
-msgstr "<link href=\"text/swriter/01/05030800.xhp\" name=\"Numbering\">大纲 & 编号</link>"
+msgid "<variable id=\"outlinelisth1\"><link href=\"text/swriter/01/05030800.xhp\" name=\"Numbering\">Outline & List</link></variable>"
+msgstr ""
-#. Zue75
+#. x3BNB
#: 05030800.xhp
msgctxt ""
"05030800.xhp\n"
"par_id3154100\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/numparapage/NumParaPage\">Adds or removes outline level, numbering, or bullets from the paragraph. You can also select the style of numbering to use, and reset the numbering in a numbered list.</ahelp>"
-msgstr "<ahelp hid=\"modules/swriter/ui/numparapage/NumParaPage\">在段落中添加或删除大纲级别、编号或项目符号。您也可选择要使用的编号样式,并重置编号列表中的编号。</ahelp>"
+msgid "<ahelp hid=\"modules/swriter/ui/numparapage/NumParaPage\">Adds or removes outline level, list style, and line numbering from the paragraph or paragraph style. You can also restart or modify the start number for numbered lists and line numbering.</ahelp>"
+msgstr ""
#. qNyVD
#: 05030800.xhp
@@ -16162,22 +16162,22 @@ msgctxt ""
msgid "Numbering"
msgstr "编号"
-#. UmpGx
+#. fFAFo
#: 05030800.xhp
msgctxt ""
"05030800.xhp\n"
"hd_id3154188\n"
"help.text"
-msgid "Numbering Style"
-msgstr "编号样式"
+msgid "List Style"
+msgstr ""
-#. WGB2B
+#. T2yMF
#: 05030800.xhp
msgctxt ""
"05030800.xhp\n"
"par_id3155178\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/numparapage/comboLB_NUMBER_STYLE\">Select the <link href=\"text/swriter/01/05130004.xhp\" name=\"Numbering Style\">Numbering Style</link> that you want to apply to the paragraph.</ahelp> These styles are also listed in the <link href=\"text/swriter/01/05140000.xhp\" name=\"Styles\">Styles</link> window <switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>(Command+T)</keycode></caseinline><defaultinline><keycode>(F11)</keycode></defaultinline></switchinline> if you click the <emph>List Styles</emph> icon."
+msgid "<ahelp hid=\"modules/swriter/ui/numparapage/comboLB_NUMBER_STYLE\">Select the <link href=\"text/swriter/01/05130004.xhp\" name=\"Numbering Style\">List Style</link> that you want to apply to the paragraph.</ahelp> These styles are also listed in the <link href=\"text/swriter/01/05140000.xhp\" name=\"Styles\">Styles</link> window (<switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline>) if you click the <emph>List Styles</emph> icon."
msgstr ""
#. MycJD
@@ -16198,22 +16198,22 @@ msgctxt ""
msgid "<ahelp hid=\"modules/swriter/ui/numparapage/editnumstyle\">Edit the properties of the selected numbering style.</ahelp> These properties will apply to all paragraphs formatted with the given numbering style."
msgstr "<ahelp hid=\"modules/swriter/ui/numparapage/editnumstyle\">编辑选中编号样式的属性。</ahelp>这些属性将应用到所有以该编号样式格式化的段落。"
-#. dXFVa
+#. dxBEA
#: 05030800.xhp
msgctxt ""
"05030800.xhp\n"
"par_id3149195\n"
"help.text"
-msgid "This button is disabled when Chapter Numbering is applied. Choose <emph>Tools - Chapter Numbering...</emph> to edit the outline level and numbering style."
+msgid "This button is disabled when Chapter Numbering is applied. Choose <emph>Tools - Chapter Numbering</emph> to edit the outline level and numbering format."
msgstr ""
-#. GR3YW
+#. zBagB
#: 05030800.xhp
msgctxt ""
"05030800.xhp\n"
"par_id3151117\n"
"help.text"
-msgid "Outline level and Numbering Style are independent of each other. Use <emph>Tools - Chapter Numbering...</emph> to assign numbering styles to paragraph styles."
+msgid "Outline level and List style are independent of each other. Use <emph>Tools - Chapter Numbering</emph> to assign a numbering format to paragraph styles used as headings in a document outline structure."
msgstr ""
#. 3KS2Y
@@ -22561,13 +22561,22 @@ msgctxt ""
msgid "Here you can create a List Style. The List Styles are organized in the <link href=\"text/swriter/01/05140000.xhp\" name=\"Styles\">Styles</link> window."
msgstr ""
-#. FZ2HA
+#. hVmyj
+#: 05130004.xhp
+msgctxt ""
+"05130004.xhp\n"
+"par_id317365356036\n"
+"help.text"
+msgid "When a List Style is created, a name is assigned to the style. The list style can be applied to paragraphs or assigned to a paragraph style in the Apply List Style section of the <link href=\"text/swriter/01/05030800.xhp\" name=\"ApplyListStyle\">Outline & List</link> tab."
+msgstr ""
+
+#. MU724
#: 05130004.xhp
msgctxt ""
"05130004.xhp\n"
"par_id3151390\n"
"help.text"
-msgid "When a List Style is created, a name is assigned to the style. Ordered lists use <link href=\"text/shared/00/00000005.xhp#formatierung\" name=\"direct formatting\">direct formatting</link>, and can be created in the <link href=\"text/shared/01/06050000.xhp\" name=\"Numbering/bullets\">Bullets and Numbering</link> dialog or with the icons of the <link href=\"text/swriter/main0206.xhp\" name=\"object bar\">object bar</link>."
+msgid "Ordered lists and unordered lists created in the <link href=\"text/shared/01/06050000.xhp\" name=\"Numbering/bullets\">Bullets and Numbering</link> dialog or with the <link href=\"text/swriter/02/02110000.xhp\" name=\"Toggle Ordered List\">Toggle Ordered List</link> and <link href=\"text/shared/02/06120000.xhp\" name=\"Toggle Unordered List\">Toggle Unordered List</link> icons of the <link href=\"text/swriter/main0202.xhp\" name=\"object bar\">Formatting</link> bar use <link href=\"text/shared/00/00000005.xhp#formatierung\" name=\"direct formatting\">direct formatting</link>. They are not list styles."
msgstr ""
#. UgisA
@@ -24604,50 +24613,41 @@ msgctxt ""
msgid "Chapter Numbering"
msgstr "章节编号"
-#. 483kg
+#. EWVsz
#: 06060000.xhp
msgctxt ""
"06060000.xhp\n"
"hd_id3154561\n"
"help.text"
-msgid "Chapter Numbering"
-msgstr "章节编号"
+msgid "<variable id=\"ChapNumh1\"><link href=\"text/swriter/01/06060000.xhp\">Chapter Numbering</link></variable>"
+msgstr ""
-#. XxAe3
+#. bAdVd
#: 06060000.xhp
msgctxt ""
"06060000.xhp\n"
"par_id3145246\n"
"help.text"
-msgid "<variable id=\"kapnum\"><ahelp hid=\".uno:ChapterNumberingDialog\">Specifies the number format and the hierarchy for chapter numbering in the current document.</ahelp></variable>"
-msgstr "<variable id=\"kapnum\"><ahelp hid=\".uno:ChapterNumberingDialog\">指定当前文档中章节编号的编号格式和层次。</ahelp></variable>"
+msgid "<variable id=\"kapnum\"><ahelp hid=\".uno:ChapterNumberingDialog\">Specifies the numbering scheme and outline format for chapter numbering in the current document.</ahelp></variable>"
+msgstr ""
-#. FqzZs
+#. PKJax
#: 06060000.xhp
msgctxt ""
"06060000.xhp\n"
"par_id3150934\n"
"help.text"
-msgid "Chapter numbering is linked to paragraph styles. By default, the \"Heading\" paragraph styles (1-10) are assigned to the corresponding chapter and outline number levels (1-10). If you want, you can assign different paragraph styles to the outline number level."
-msgstr "章节编号与段落样式相关联。默认情况下,「标题」段落样式 (1-10) 被分配给相应的章节与大纲编号级别 (1-10)。如果需要,也可以为大纲编号级别分配其他段落样式。"
+msgid "Chapter numbering is achieved by assigning paragraph styles to outline levels, and a numbering scheme for each outline level. By default, the \"Heading\" paragraph styles (1-10) are assigned to the corresponding outline levels (1-10). You can use the dialog to assign a different paragraph style to an outline level."
+msgstr ""
-#. uuEEQ
+#. DpAKZ
#: 06060000.xhp
msgctxt ""
"06060000.xhp\n"
"par_id8237250\n"
"help.text"
-msgid "If you want numbered headings, use the <emph>Tools - Chapter Numbering</emph> menu command to assign numbering to a paragraph style. Do not use the Numbering icon on the Formatting toolbar."
-msgstr "如果要对标题进行编号,请使用「<emph>工具 - 章节编号</emph>」菜单命令为段落样式指定编号。请不要使用「格式」工具栏上的「编号」图标。"
-
-#. GBEmb
-#: 06060000.xhp
-msgctxt ""
-"06060000.xhp\n"
-"par_id3147567\n"
-"help.text"
-msgid "To highlight the screen display of chapter and outline numbers, choose <emph>View - Field Shadings</emph>."
-msgstr "要在屏幕上高亮显示章节与大纲编号,请选择「<emph>视图 - 字段阴影</emph>」。"
+msgid "<variable id=\"chapter_numbering_tip\">If you want numbered headings, choose <menuitem>Tools - </menuitem><link name=\"chapternumbering\" href=\"text/swriter/01/06060000.xhp#ChapNumh1\"><menuitem>Chapter Numbering</menuitem></link>. This command opens a dialog where numbering schemes can be assigned to paragraph styles used for headings. Do not use the <link href=\"text/swriter/02/02110000.xhp\" name=\"Toggle Ordered List\">Toggle Ordered List</link> icon on the <link href=\"text/swriter/main0202.xhp\" name=\"FormattingBar\">Formatting Bar</link> or the <menuitem>Format - </menuitem><link href=\"text/shared/01/06050000.xhp\" name=\"BulletsNumbering\"><menuitem>Bullets and Numbering</menuitem></link> dialog.</variable>"
+msgstr ""
#. DFbiG
#: 06060000.xhp
@@ -24658,22 +24658,22 @@ msgctxt ""
msgid "Load/Save"
msgstr "载入/保存"
-#. YUER3
+#. 4jFGn
#: 06060000.xhp
msgctxt ""
"06060000.xhp\n"
"par_id3147512\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/outlinenumbering/user\">Saves or loads a chapter numbering format. A saved chapter numbering format is available to all text documents.</ahelp>"
+msgid "<ahelp hid=\"modules/swriter/ui/outlinenumbering/user\">Saves or loads a chapter numbering format. A saved chapter numbering format is available to load into other text documents.</ahelp>"
msgstr ""
-#. Eoxwy
+#. DkYUj
#: 06060000.xhp
msgctxt ""
"06060000.xhp\n"
"par_id3150979\n"
"help.text"
-msgid "The <emph>Load/Save</emph> button is only available for chapter numbering. For numbered or bulleted list styles, modify the numbering styles of the paragraphs."
+msgid "The <widget>Load/Save</widget> button is only available for chapter numbering. Use List styles to save formatting for ordered or unordered lists."
msgstr ""
#. EV2DT
@@ -24685,14 +24685,14 @@ msgctxt ""
msgid "Untitled 1 - 9"
msgstr "未命名 1 - 9"
-#. tbyhC
+#. GEBee
#: 06060000.xhp
msgctxt ""
"06060000.xhp\n"
"par_id3150350\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/outlinenumbering/form1\">Select the predefined numbering style that you want to assign to the selected outline level.</ahelp>"
-msgstr "<ahelp hid=\"modules/swriter/ui/outlinenumbering/form1\">选择要为选中的大纲级别指定的预定义编号样式。</ahelp>"
+msgid "<ahelp hid=\"modules/swriter/ui/outlinenumbering/form1\">Select a predefined numbering format.</ahelp> Save your own predefined numbering formats using <emph>Save As</emph>."
+msgstr ""
#. NoHGV
#: 06060000.xhp
@@ -24703,32 +24703,14 @@ msgctxt ""
msgid "Save As"
msgstr "另存为"
-#. LsqXh
+#. bwJgP
#: 06060000.xhp
msgctxt ""
"06060000.xhp\n"
"par_id3155892\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/outlinenumbering/saveas\">Opens a dialog where you can save the current settings for the selected chapter and outline level. You can then load these settings from another document.</ahelp>"
-msgstr "<ahelp hid=\"modules/swriter/ui/outlinenumbering/saveas\">打开一个对话框,可以在其中保存选中的章节与大纲级别的当前设置。然后可以在其他文档加载这些设置。</ahelp>"
-
-#. G6SB9
-#: 06060000.xhp
-msgctxt ""
-"06060000.xhp\n"
-"hd_id3149689\n"
-"help.text"
-msgid "Save As"
-msgstr "另存为"
-
-#. Uq3CL
-#: 06060000.xhp
-msgctxt ""
-"06060000.xhp\n"
-"par_id3154200\n"
-"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/numberingnamedialog/form\">Click a numbering style in the list, and then enter a name for the style. The numbers correspond to the outline level that the styles are assigned to.</ahelp>"
-msgstr "<ahelp hid=\"modules/swriter/ui/numberingnamedialog/form\">点击列表中的编号样式,然后输入样式的名称。编号与指定了这些样式的大纲级别相对应。</ahelp>"
+msgid "<ahelp hid=\"modules/swriter/ui/outlinenumbering/saveas\">Opens a dialog where you can save the current numbering and position settings for all levels. Saved settings are available to load into other documents.</ahelp>"
+msgstr ""
#. G9Fz2
#: 06060100.xhp
@@ -24766,13 +24748,13 @@ msgctxt ""
msgid "Level"
msgstr "级"
-#. EBZSv
+#. kFsmA
#: 06060100.xhp
msgctxt ""
"06060100.xhp\n"
"par_id3150018\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/outlinenumberingpage/level\">Click the chapter and outline level that you want to modify, and then specify the numbering options for the level.</ahelp> To apply the numbering options, except for paragraph style, to all the levels, click \"1-10\"."
+msgid "<ahelp hid=\"modules/swriter/ui/outlinenumberingpage/level\">Click the outline level that you want to modify, and then specify the numbering options for the level.</ahelp> To apply the numbering options, except for paragraph style, to all the levels, click \"1-10\"."
msgstr ""
#. s4LDs
@@ -24802,14 +24784,14 @@ msgctxt ""
msgid "Paragraph Style"
msgstr "段落样式"
-#. EXNSB
+#. KQMUB
#: 06060100.xhp
msgctxt ""
"06060100.xhp\n"
"par_id3153722\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/outlinenumberingpage/style\">Select the paragraph style that you want to assign to the selected chapter and outline level.</ahelp> If you click \"None\", the selected outline level is not defined."
-msgstr "<ahelp hid=\"modules/swriter/ui/outlinenumberingpage/style\">选择分配给选中章节与大纲级别的段落样式。</ahelp>如果点击「无」,则不定义选中的大纲级别。"
+msgid "<ahelp hid=\"modules/swriter/ui/outlinenumberingpage/style\">Select the paragraph style that you want to assign to the selected outline level.</ahelp> If you click \"None\", the selected outline level is not defined."
+msgstr ""
#. 2Ko3X
#: 06060100.xhp
@@ -24820,14 +24802,14 @@ msgctxt ""
msgid "Number"
msgstr "编号"
-#. sayxC
+#. Ve6Gs
#: 06060100.xhp
msgctxt ""
"06060100.xhp\n"
"par_id3156319\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/outlinenumberingpage/numbering\">Select the numbering style that you want to apply to the selected outline level.</ahelp>"
-msgstr "<ahelp hid=\"modules/swriter/ui/outlinenumberingpage/numbering\">选择要对选中大纲级别应用的编号样式。</ahelp>"
+msgid "<ahelp hid=\"modules/swriter/ui/outlinenumberingpage/numbering\">Select the numbering scheme that you want to apply to the selected outline level.</ahelp>"
+msgstr ""
#. uCj2F
#: 06060100.xhp
@@ -24847,6 +24829,24 @@ msgctxt ""
msgid "<emph>Description</emph>"
msgstr "「<emph>说明</emph>」"
+#. AoxBN
+#: 06060100.xhp
+msgctxt ""
+"06060100.xhp\n"
+"par_id3155899\n"
+"help.text"
+msgid "1, 2, 3, ..."
+msgstr "1, 2, 3, ..."
+
+#. rDEQw
+#: 06060100.xhp
+msgctxt ""
+"06060100.xhp\n"
+"par_id3154191\n"
+"help.text"
+msgid "Arabic numerals"
+msgstr "阿拉伯数字"
+
#. aMCaW
#: 06060100.xhp
msgctxt ""
@@ -24919,24 +24919,6 @@ msgctxt ""
msgid "Roman numerals (lower)"
msgstr "小写的罗马数字"
-#. AoxBN
-#: 06060100.xhp
-msgctxt ""
-"06060100.xhp\n"
-"par_id3155899\n"
-"help.text"
-msgid "1, 2, 3, ..."
-msgstr "1, 2, 3, ..."
-
-#. rDEQw
-#: 06060100.xhp
-msgctxt ""
-"06060100.xhp\n"
-"par_id3154191\n"
-"help.text"
-msgid "Arabic numerals"
-msgstr "阿拉伯数字"
-
#. cihkt
#: 06060100.xhp
msgctxt ""
@@ -25000,14 +24982,14 @@ msgctxt ""
msgid "Character Style"
msgstr "字符样式"
-#. xjBZC
+#. h5uaa
#: 06060100.xhp
msgctxt ""
"06060100.xhp\n"
"par_id3147224\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/outlinenumberingpage/charstyle\">Select the format of the numbering character.</ahelp>"
-msgstr "<ahelp hid=\"modules/swriter/ui/outlinenumberingpage/charstyle\">选择编号字符的格式。</ahelp>"
+msgid "<ahelp hid=\"modules/swriter/ui/outlinenumberingpage/charstyle\">Select the character style of the numbering character.</ahelp>"
+msgstr ""
#. bkGnf
#: 06060100.xhp
@@ -26611,14 +26593,14 @@ msgctxt ""
msgid "Line Numbering"
msgstr "行编号"
-#. ca98d
+#. ZDVZ9
#: 06180000.xhp
msgctxt ""
"06180000.xhp\n"
"par_id3150249\n"
"help.text"
-msgid "<variable id=\"zeinum\">Adds or removes and formats line numbers in the current document. To exclude a paragraph from line numbering, click in the paragraph, choose <emph>Format - Paragraph</emph>, click the <emph>Numbering </emph>tab, and then clear the <emph>Include this paragraph in line numbering</emph> check box.</variable> You can also exclude a paragraph style from line numbering."
-msgstr "<variable id=\"zeinum\">在当前文档中添加或取消行编号,以及格式化行编号。要使段落不使用行编号,请在段落中点击,选择「<emph>格式 - 段落</emph>」,点击「<emph>编号</emph>」选项卡,然后清除「<emph>在行编号中包括此段落</emph>」复选框。</variable>您也可以使某个段落样式不使用行编号。"
+msgid "<variable id=\"zeinum\">Adds or removes and formats line numbers in the current document. To exclude a paragraph from line numbering, click in the paragraph, choose <menuitem>Format - Paragraph</menuitem>, click the <emph>Outline & List</emph> tab, and then clear the <emph>Include this paragraph in line numbering</emph> check box.</variable> You can also exclude a paragraph style from line numbering."
+msgstr ""
#. GcdFF
#: 06180000.xhp
@@ -27088,50 +27070,32 @@ msgctxt ""
msgid "<link href=\"text/swriter/01/02130000.xhp\" name=\"Bibliography Entry\">Bibliography Entry</link>"
msgstr ""
-#. 4qVPZ
+#. YwkE4
#: format_object.xhp
msgctxt ""
"format_object.xhp\n"
"tit\n"
"help.text"
-msgid "Object"
-msgstr "对象"
+msgid "Text Box and Shape"
+msgstr ""
-#. 2vkco
+#. 5XTkz
#: format_object.xhp
msgctxt ""
"format_object.xhp\n"
"par_idN10548\n"
"help.text"
-msgid "<link href=\"text/swriter/01/format_object.xhp\">Object</link>"
-msgstr "<link href=\"text/swriter/01/format_object.xhp\">对象</link>"
+msgid "<link href=\"text/swriter/01/format_object.xhp\">Text Box and Shape</link>"
+msgstr ""
-#. ev5DK
+#. RfLw2
#: format_object.xhp
msgctxt ""
"format_object.xhp\n"
"par_idN10558\n"
"help.text"
-msgid "<ahelp hid=\".\">Opens a submenu to edit the properties of the selected object.</ahelp>"
-msgstr "<ahelp hid=\".\">打开子菜单,编辑选中对象的属性。</ahelp>"
-
-#. QNeGm
-#: format_object.xhp
-msgctxt ""
-"format_object.xhp\n"
-"hd_id1863460\n"
-"help.text"
-msgid "<link href=\"text/shared/01/05990000.xhp\">Text Attributes</link>"
-msgstr "<link href=\"text/shared/01/05990000.xhp\">文字属性</link>"
-
-#. vqJQ9
-#: format_object.xhp
-msgctxt ""
-"format_object.xhp\n"
-"par_id3542588\n"
-"help.text"
-msgid "Sets the layout and anchoring properties for text in the selected drawing or text object."
-msgstr "为选中的绘图对象或文字对象中的文本设置版式和锁定属性。"
+msgid "<ahelp hid=\".\">Opens a submenu to edit the properties of the selected textbox or shape.</ahelp>"
+msgstr ""
#. UWnvc
#: format_object.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/swriter/02.po b/source/zh-CN/helpcontent2/source/text/swriter/02.po
index 8175e113b08..93638ebbc23 100644
--- a/source/zh-CN/helpcontent2/source/text/swriter/02.po
+++ b/source/zh-CN/helpcontent2/source/text/swriter/02.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-02-22 17:17+0100\n"
+"POT-Creation-Date: 2021-03-23 11:45+0100\n"
"PO-Revision-Date: 2019-07-10 04:02+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,23 +16,23 @@ msgstr ""
"X-Generator: LibreOffice\n"
"X-POOTLE-MTIME: 1562731359.000000\n"
-#. SGjBV
+#. sqxGb
#: 02110000.xhp
msgctxt ""
"02110000.xhp\n"
"tit\n"
"help.text"
-msgid "Numbering on/off"
-msgstr "编号打开/关闭"
+msgid "Toggle Ordered List"
+msgstr ""
-#. ACieD
+#. z8hCm
#: 02110000.xhp
msgctxt ""
"02110000.xhp\n"
"hd_id3150220\n"
"help.text"
-msgid "<link href=\"text/swriter/02/02110000.xhp\" name=\"Numbering on/off\">Numbering On/Off</link>"
-msgstr "<link href=\"text/swriter/02/02110000.xhp\" name=\"Numbering on/off\">编号打开/关闭</link>"
+msgid "<variable id=\"numberingh1\"><link href=\"text/swriter/02/02110000.xhp\" name=\"Numbering on/off\">Toggle Ordered List</link></variable>"
+msgstr ""
#. 7QYre
#: 02110000.xhp
@@ -52,23 +52,23 @@ msgctxt ""
msgid "Some of the bullets and numbering options are not available when working in the <link href=\"text/swriter/01/03120000.xhp\" name=\"Web Layout\">Web Layout</link>."
msgstr "使用 <link href=\"text/swriter/01/03120000.xhp\" name=\"Web Layout\">Web 版式</link>时,某些项目符号与编号选项不可用。"
-#. dARXh
+#. dwn77
#: 02110000.xhp
msgctxt ""
"02110000.xhp\n"
"par_id3150502\n"
"help.text"
-msgid "<image id=\"img_id3150508\" src=\"cmd/sc_defaultnumbering.png\" width=\"0.222inch\" height=\"0.222inch\"><alt id=\"alt_id3150508\">Icon</alt></image>"
-msgstr "<image id=\"img_id3150508\" src=\"cmd/sc_defaultnumbering.png\" width=\"0.222inch\" height=\"0.222inch\"><alt id=\"alt_id3150508\">图标</alt></image>"
+msgid "<image id=\"img_id3150508\" src=\"cmd/lc_defaultnumbering.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3150508\">Toggle Ordered List Icon</alt></image>"
+msgstr ""
-#. Xfqcn
+#. yYfzC
#: 02110000.xhp
msgctxt ""
"02110000.xhp\n"
"par_id3147525\n"
"help.text"
-msgid "Numbering On/Off"
-msgstr "编号打开/关闭"
+msgid "Toggle Ordered List"
+msgstr ""
#. fVWig
#: 02110000.xhp
@@ -502,50 +502,59 @@ msgctxt ""
msgid "Sum"
msgstr "求和"
-#. 4a76q
+#. GqFYN
#: 06040000.xhp
msgctxt ""
"06040000.xhp\n"
"tit\n"
"help.text"
-msgid "Numbering Off"
-msgstr "隐藏编号"
+msgid "No List"
+msgstr ""
-#. hAqDK
+#. wCBAJ
#: 06040000.xhp
msgctxt ""
"06040000.xhp\n"
"hd_id3145822\n"
"help.text"
-msgid "<link href=\"text/swriter/02/06040000.xhp\" name=\"Numbering Off\">Numbering Off</link>"
-msgstr "<link href=\"text/swriter/02/06040000.xhp\" name=\"隐藏编号\">隐藏编号</link>"
+msgid "<link href=\"text/swriter/02/06040000.xhp\" name=\"Numbering Off\">No List</link>"
+msgstr ""
-#. i8F2B
+#. MPBzT
#: 06040000.xhp
msgctxt ""
"06040000.xhp\n"
"par_id3154505\n"
"help.text"
-msgid "<ahelp hid=\".uno:RemoveBullets\" visibility=\"visible\">Turns off numbering or bullets in the current paragraph or selected paragraphs.</ahelp>"
-msgstr "<ahelp hid=\".uno:RemoveBullets\" visibility=\"visible\">关闭当前段落或选中段落的编号或项目符号。</ahelp>"
+msgid "<ahelp hid=\".uno:RemoveBullets\" visibility=\"visible\">Removes numbering or bullets and list indenting for the current paragraph or selected paragraphs.</ahelp>"
+msgstr ""
-#. p6pTC
+#. LDHCy
#: 06040000.xhp
msgctxt ""
"06040000.xhp\n"
"par_id3151177\n"
"help.text"
-msgid "<image src=\"cmd/sc_removebullets.png\" id=\"img_id3145083\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3145083\">Icon Numbering Off</alt></image>"
+msgid "<image src=\"cmd/lc_removebullets.png\" id=\"img_id3145083\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3145083\">Icon No List</alt></image>"
msgstr ""
-#. tfm6a
+#. iNFhx
#: 06040000.xhp
msgctxt ""
"06040000.xhp\n"
"par_id3150749\n"
"help.text"
-msgid "Numbering Off"
-msgstr "隐藏编号"
+msgid "No List"
+msgstr ""
+
+#. 5FX23
+#: 06040000.xhp
+msgctxt ""
+"06040000.xhp\n"
+"par_id811614270889392\n"
+"help.text"
+msgid "To preserve indenting, but remove bullet or number, place cursor at the beginning of the paragraph and press <keycode>Backspace</keycode>."
+msgstr ""
#. MZn4T
#: 06070000.xhp
@@ -790,14 +799,41 @@ msgctxt ""
msgid "<link href=\"text/swriter/02/06140000.xhp\" name=\"Restart Numbering\">Restart Numbering</link>"
msgstr "<link href=\"text/swriter/02/06140000.xhp\" name=\"重新开始编号\">重新开始编号</link>"
-#. tRqAn
+#. iwJHH
#: 06140000.xhp
msgctxt ""
"06140000.xhp\n"
"par_id3145249\n"
"help.text"
-msgid "<ahelp hid=\".uno:NumberingStart\" visibility=\"visible\">Restarts the text numbering.</ahelp> This is only visible when the cursor is positioned within numbered or bulleted text."
-msgstr "<ahelp hid=\".uno:NumberingStart\" visibility=\"visible\">重新开始文字编号。</ahelp>仅当光标位于编号文字或项目符号文字中时,此图标才可见。"
+msgid "<ahelp hid=\".uno:NumberingStart\" visibility=\"visible\">Restarts list numbering from 1.</ahelp> This command is only active when the cursor is positioned within a list."
+msgstr ""
+
+#. 89Xm9
+#: 06140000.xhp
+msgctxt ""
+"06140000.xhp\n"
+"par_id631616370838434\n"
+"help.text"
+msgid "Choose <menuitem>Format - Lists - Restart Numbering</menuitem>."
+msgstr ""
+
+#. fh5aw
+#: 06140000.xhp
+msgctxt ""
+"06140000.xhp\n"
+"par_id31616370717930\n"
+"help.text"
+msgid "Place cursor in a list paragraph, right-click and choose <menuitem>List - Restart Numbering</menuitem>."
+msgstr ""
+
+#. RgibL
+#: 06140000.xhp
+msgctxt ""
+"06140000.xhp\n"
+"par_id351616370727010\n"
+"help.text"
+msgid "On <link href=\"text/shared/01/06050000.xhp\" name=\"BulletsNumbering\"><emph>Bullets and Numbering</emph></link> bar, click"
+msgstr ""
#. SLjuC
#: 06140000.xhp
@@ -817,6 +853,24 @@ msgctxt ""
msgid "Restart Numbering"
msgstr "重新开始编号"
+#. DmEY6
+#: 06140000.xhp
+msgctxt ""
+"06140000.xhp\n"
+"par_id761616370463787\n"
+"help.text"
+msgid "To remove the numbering restart, apply the command again in the paragraph where the numbering was restarted."
+msgstr ""
+
+#. bEE4F
+#: 06140000.xhp
+msgctxt ""
+"06140000.xhp\n"
+"par_id261616371203225\n"
+"help.text"
+msgid "To restart numbering with a number greater than 1, right-click in the paragraph where you want to restart numbering, choose <menuitem>Paragraph - </menuitem><embedvar href=\"textswriter/01/05030800.xhp#outlinelisth1\"/> tab, select <menuitem>Restart numbering at this paragraph</menuitem> and enter the start number in <menuitem>Start with</menuitem>."
+msgstr ""
+
#. qCdhk
#: 08010000.xhp
msgctxt ""
@@ -3814,6 +3868,213 @@ msgctxt ""
msgid "Text Animation"
msgstr "文本动画"
+#. RajEo
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"tit\n"
+"help.text"
+msgid "Add to List"
+msgstr ""
+
+#. mjGvU
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"bm_id1001616018043189\n"
+"help.text"
+msgid "<bookmark_value>Add to List</bookmark_value><bookmark_value>Lists;merging</bookmark_value>"
+msgstr ""
+
+#. X8yaz
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"hd_id711614068729277\n"
+"help.text"
+msgid "<variable id=\"addtolisth1\"><link href=\"text/swriter/02/add_to_list.xhp\" name=\"Add to List\">Add to List</link></variable>"
+msgstr ""
+
+#. kM6AJ
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id231614069215429\n"
+"help.text"
+msgid "Include selected paragraphs, whether a list item or not, as part of a list."
+msgstr ""
+
+#. pxcFF
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id151614079148636\n"
+"help.text"
+msgid "<variable id=\"howtogetaddtolist\">Choose <menuitem>Format - Lists - Add to List</menuitem></variable>."
+msgstr ""
+
+#. PUsxs
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id631614079159620\n"
+"help.text"
+msgid "Right-click a paragraph, choose <menuitem>List - Add to List</menuitem>."
+msgstr ""
+
+#. Zb43J
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id151615752168785\n"
+"help.text"
+msgid "<variable id=\"toolbar\">On <menuitem>Bullets and Numbering</menuitem> bar, click <emph>Add to List</emph> icon.</variable>"
+msgstr ""
+
+#. ViA36
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id651615752040364\n"
+"help.text"
+msgid "<image src=\"cmd/lc_continuenumbering.png\" id=\"img_id981615752040364\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id761615752040364\">Add to List Icon</alt></image>"
+msgstr ""
+
+#. hxMDa
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id51615752040365\n"
+"help.text"
+msgid "Add to List"
+msgstr ""
+
+#. 6kruw
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id711616001147778\n"
+"help.text"
+msgid "The list labeling and indent formatting are applied to the selected paragraphs. The position of the paragraphs in the document does not change."
+msgstr ""
+
+#. pADj5
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"hd_id851614072896370\n"
+"help.text"
+msgid "Add Selected Paragraphs to a List"
+msgstr ""
+
+#. FGi4A
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id491615988072533\n"
+"help.text"
+msgid "Select paragraphs, whether in a list or not, to be added to a list."
+msgstr ""
+
+#. smjtz
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id271615998908234\n"
+"help.text"
+msgid "For multiple selections, press and hold the <keycode> Ctrl</keycode> key after the first selection. The <keycode>Ctrl</keycode> key can be released without losing the selections, but must be pressed when clicking in the document."
+msgstr ""
+
+#. gwgyD
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id551615985719902\n"
+"help.text"
+msgid "Press and hold the <keycode>Ctrl</keycode> key, then place cursor in the list."
+msgstr ""
+
+#. 3VT7j
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id901615999151001\n"
+"help.text"
+msgid "Do one of the following:"
+msgstr ""
+
+#. qPKKN
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id141615979735757\n"
+"help.text"
+msgid "<embedvar href=\"text/swriter/02/add_to_list.xhp#howtogetaddtolist\"/>"
+msgstr ""
+
+#. FADNr
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id961614073544958\n"
+"help.text"
+msgid "<embedvar href=\"text/swriter/02/add_to_list.xhp#toolbar\"/>"
+msgstr ""
+
+#. D98D9
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id161615999749854\n"
+"help.text"
+msgid "<variable id=\"rightclick\">Right-click, choose <menuitem>List - Add to List</menuitem>.</variable> To preserve the selection, at least one character must be selected in the list."
+msgstr ""
+
+#. qFmgS
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id861614074931979\n"
+"help.text"
+msgid "This procedure works for ordered and unordered lists."
+msgstr ""
+
+#. L9RdM
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"hd_id441616017998739\n"
+"help.text"
+msgid "Add Consecutive List Entries to an Immediately Prior List"
+msgstr ""
+
+#. GJuBD
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id631616018294373\n"
+"help.text"
+msgid "Select one or more consecutive list entries, starting from the first entry, that you want to add to the immediately prior list."
+msgstr ""
+
+#. g9LRR
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id621616018340980\n"
+"help.text"
+msgid "<embedvar href=\"text/swriter/02/add_to_list.xhp#rightclick\"/>"
+msgstr ""
+
+#. p9hUv
+#: add_to_list.xhp
+msgctxt ""
+"add_to_list.xhp\n"
+"par_id811616018796902\n"
+"help.text"
+msgid "Use this procedure to combine two lists."
+msgstr ""
+
#. JsrhA
#: word_count_stb.xhp
msgctxt ""
diff --git a/source/zh-CN/helpcontent2/source/text/swriter/04.po b/source/zh-CN/helpcontent2/source/text/swriter/04.po
index d08e04423f4..2fa9d11fd52 100644
--- a/source/zh-CN/helpcontent2/source/text/swriter/04.po
+++ b/source/zh-CN/helpcontent2/source/text/swriter/04.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-03-13 12:06+0100\n"
+"POT-Creation-Date: 2021-03-08 14:40+0100\n"
"PO-Revision-Date: 2019-07-04 11:50+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -529,14 +529,14 @@ msgctxt ""
msgid "F12"
msgstr "F12 键"
-#. S2S9J
+#. jiXFc
#: 01020000.xhp
msgctxt ""
"01020000.xhp\n"
"par_id3148959\n"
"help.text"
-msgid "Numbering on"
-msgstr "显示编号"
+msgid "Toggle Ordered List"
+msgstr ""
#. wAUBd
#: 01020000.xhp
@@ -565,14 +565,14 @@ msgctxt ""
msgid "Shift+F12"
msgstr "Shift+F12 键"
-#. iuAiR
+#. fkbSD
#: 01020000.xhp
msgctxt ""
"01020000.xhp\n"
"par_id3152763\n"
"help.text"
-msgid "Bullets on"
-msgstr "显示项目符号"
+msgid "Toggle Unordered List"
+msgstr ""
#. pneN5
#: 01020000.xhp
@@ -583,14 +583,14 @@ msgctxt ""
msgid "<switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F12"
msgstr "<switchinline select=\"sys\"><caseinline select=\"MAC\">命令</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F12 键"
-#. dGgoN
+#. E9pG5
#: 01020000.xhp
msgctxt ""
"01020000.xhp\n"
"par_id3153901\n"
"help.text"
-msgid "Numbering / Bullets off"
-msgstr "隐藏编号/项目符号"
+msgid "Ordered / Unordered List off"
+msgstr ""
#. HyF9c
#: 01020000.xhp
diff --git a/source/zh-CN/helpcontent2/source/text/swriter/guide.po b/source/zh-CN/helpcontent2/source/text/swriter/guide.po
index bc2b6b7b0fc..6a36a859ff3 100644
--- a/source/zh-CN/helpcontent2/source/text/swriter/guide.po
+++ b/source/zh-CN/helpcontent2/source/text/swriter/guide.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-02-22 17:17+0100\n"
+"POT-Creation-Date: 2021-03-23 11:45+0100\n"
"PO-Revision-Date: 2019-07-10 03:15+0000\n"
"Last-Translator: Dian LI <xslidian@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3031,14 +3031,14 @@ msgctxt ""
msgid "<bookmark_value>captions; adding chapter numbers</bookmark_value> <bookmark_value>objects; captioning automatically</bookmark_value> <bookmark_value>numbering; captions</bookmark_value> <bookmark_value>automatic numbering;of objects</bookmark_value> <bookmark_value>chapter numbers in captions</bookmark_value> <bookmark_value>inserting;chapter numbers in captions</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>"
-#. GfPV7
+#. xAnbA
#: captions_numbers.xhp
msgctxt ""
"captions_numbers.xhp\n"
"hd_id3147684\n"
"help.text"
-msgid "<variable id=\"captions_numbers\"><link href=\"text/swriter/guide/captions_numbers.xhp\" name=\"Adding Chapter Numbers to Captions\">Adding Chapter Numbers to Captions</link> </variable>"
-msgstr "<variable id=\"captions_numbers\"><link href=\"text/swriter/guide/captions_numbers.xhp\" name=\"Adding Chapter Numbers to Captions\">添加章节编号至标题</link> </variable>"
+msgid "<variable id=\"captions_numbers\"><link href=\"text/swriter/guide/captions_numbers.xhp\" name=\"Adding Chapter Numbers to Captions\">Adding Chapter Numbers to Captions</link></variable>"
+msgstr ""
#. 5efvj
#: captions_numbers.xhp
@@ -3076,14 +3076,14 @@ msgctxt ""
msgid "Choose <emph>Insert - Caption</emph>."
msgstr "选择「<emph>插入 - 标题</emph>」。"
-#. UpjLH
+#. 4Js6V
#: captions_numbers.xhp
msgctxt ""
"captions_numbers.xhp\n"
"par_id3150527\n"
"help.text"
-msgid "Select a caption title from the <item type=\"menuitem\">Category</item> box, and select a numbering style in the <item type=\"menuitem\">Numbering</item> box. <br/>You also can enter a caption text in this dialog. If you want, enter text in the <item type=\"menuitem\">Caption</item> box."
-msgstr "从「<item type=\"menuitem\">类别</item>」框中选择标题,然后从「<item type=\"menuitem\">编号</item>」框中选择编号样式。<br/>还可以在此对话框中输入标题文本。如果需要,请在「<item type=\"menuitem\">标题</item>」框中输入文本。"
+msgid "Select a caption title from the <menuitem>Category</menuitem> box, and select a numbering scheme in the <menuitem>Numbering</menuitem> box. <br/>You also can enter a caption text in this dialog. If you want, enter text in the <menuitem>Caption</menuitem> box."
+msgstr ""
#. H329F
#: captions_numbers.xhp
@@ -3319,32 +3319,32 @@ msgctxt ""
msgid "To Add Automatic Numbering to a Heading Style"
msgstr "向标题样式中添加自动编号"
-#. Dxqw8
+#. Q2Dq4
#: chapter_numbering.xhp
msgctxt ""
"chapter_numbering.xhp\n"
"par_id3154255\n"
"help.text"
-msgid "Choose <item type=\"menuitem\">Tools - Chapter Numbering</item>, and then click the <item type=\"menuitem\">Numbering</item> tab."
-msgstr "选择「<item type=\"menuitem\">工具 - 章节编号</item>」,然后点击「<item type=\"menuitem\">编号</item>」选项卡。"
+msgid "Choose <menuitem>Tools - Chapter Numbering</menuitem>, and then click the <menuitem>Numbering</menuitem> tab."
+msgstr ""
-#. 8RDya
+#. UuWGT
#: chapter_numbering.xhp
msgctxt ""
"chapter_numbering.xhp\n"
"par_id3155891\n"
"help.text"
-msgid "In the <item type=\"menuitem\">Paragraph Style</item> box, select the heading style that you want to add chapter numbers to."
-msgstr "在「<item type=\"menuitem\">段落样式</item>」框中,选择要添加章节号的标题样式。"
+msgid "In the <menuitem>Paragraph style</menuitem> box, select the heading style that you want to add chapter numbers to."
+msgstr ""
-#. dGoy7
+#. EZW6q
#: chapter_numbering.xhp
msgctxt ""
"chapter_numbering.xhp\n"
"par_id3150513\n"
"help.text"
-msgid "In the <item type=\"menuitem\">Numbers</item> box, select the numbering style that you want to use, and then click <item type=\"menuitem\">OK</item>."
-msgstr "在「<item type=\"menuitem\">编号</item>框中,选择要使用的编号样式,然后点击<item type=\"menuitem\">确定</item>」。"
+msgid "In the <menuitem>Number</menuitem> box, select the numbering scheme that you want to use, and then click <menuitem>OK</menuitem>."
+msgstr ""
#. EChDL
#: chapter_numbering.xhp
@@ -3364,14 +3364,23 @@ msgctxt ""
msgid "Click at the beginning of the text in the heading paragraph, after the number."
msgstr "在标题段落中的文本开始处,在编号后点击。"
-#. ZbJV9
+#. ABejd
#: chapter_numbering.xhp
msgctxt ""
"chapter_numbering.xhp\n"
"par_idN107D9\n"
"help.text"
-msgid "Press the Backspace key to delete the number."
-msgstr "按「退格键」可删除数字。"
+msgid "Press the <keycode>Backspace</keycode> key to delete the number."
+msgstr ""
+
+#. ycK3V
+#: chapter_numbering.xhp
+msgctxt ""
+"chapter_numbering.xhp\n"
+"par_id441614161571912\n"
+"help.text"
+msgid "Press <keycode>Shift+Backspace</keycode> with the cursor at the beginning of the heading to return the number."
+msgstr ""
#. itdUu
#: chapter_numbering.xhp
@@ -5470,14 +5479,14 @@ msgctxt ""
msgid "Click 'Page' in the <emph>Type</emph> list and 'Next page' in the <emph>Select</emph> list."
msgstr "在「<emph>类型</emph>」列表中点击「页面」,在「<emph>选择</emph>」列表中点击「下一页」。"
-#. 4Y7oL
+#. gWQDr
#: footer_nextpage.xhp
msgctxt ""
"footer_nextpage.xhp\n"
"par_id3150517\n"
"help.text"
-msgid "Click a numbering style in the <item type=\"menuitem\">Format</item> list."
-msgstr "点击「<item type=\"menuitem\">格式</item>」列表中的编号样式。"
+msgid "Click a numbering scheme in the <menuitem>Format</menuitem> list."
+msgstr ""
#. 9YJwh
#: footer_nextpage.xhp
@@ -6937,14 +6946,14 @@ msgctxt ""
msgid "To Create a Paragraph Style for Chapter Titles"
msgstr "创建章节标题的段落样式"
-#. 8ScLd
+#. caxXE
#: header_with_chapter.xhp
msgctxt ""
"header_with_chapter.xhp\n"
"par_id3155874\n"
"help.text"
-msgid "Choose <item type=\"menuitem\">Tools - Chapter Numbering.</item>"
-msgstr "选择「<item type=\"menuitem\">工具 - 章节编号</item>」。"
+msgid "Choose <menuitem>Tools - Chapter Numbering.</menuitem>"
+msgstr ""
#. B8P3C
#: header_with_chapter.xhp
@@ -6955,14 +6964,14 @@ msgctxt ""
msgid "In the <item type=\"menuitem\">Style</item> box, select the paragraph style that you want to use for chapter titles, for example, \"Heading 1\"."
msgstr "在「<item type=\"menuitem\">样式</item>」框中,选择要用于章节标题的段落样式,例如「标题 1」。"
-#. u3oNh
+#. LoZJ2
#: header_with_chapter.xhp
msgctxt ""
"header_with_chapter.xhp\n"
"par_id3147124\n"
"help.text"
-msgid "Select the numbering style for the chapter titles in the <item type=\"menuitem\">Number</item> box, for example, \"1,2,3...\"."
-msgstr "在「<item type=\"menuitem\">编号</item>」框中选择章节标题的编号样式,例如「\"1,2,3...」。"
+msgid "Select the numbering scheme for the chapter titles in the <menuitem>Number</menuitem> box, for example, \"1,2,3...\"."
+msgstr ""
#. AHCua
#: header_with_chapter.xhp
@@ -7774,14 +7783,14 @@ msgctxt ""
msgid "Position the cursor at the place where no hyphenation should occur."
msgstr "将光标移动到断词不应发生的位置。"
-#. pciJs
+#. eFYEG
#: hyphen_prevent.xhp
msgctxt ""
"hyphen_prevent.xhp\n"
"par_id0302200910262867\n"
"help.text"
-msgid "Choose <item type=\"menuitem\">Insert - Formatting Mark - No-width no break</item>."
-msgstr "选择「<item type=\"menuitem\">插入 - 格式化标记 -零宽度不间断空格</item>」。"
+msgid "Choose <menuitem>Insert - Formatting Mark - Word Joiner</menuitem>."
+msgstr ""
#. 6u4r9
#: hyphen_prevent.xhp
@@ -8926,22 +8935,22 @@ msgctxt ""
msgid "Click <emph>OK</emph>."
msgstr "点击「<emph>确定</emph>」。"
-#. A74Fc
+#. FiGft
#: indices_toc.xhp
msgctxt ""
"indices_toc.xhp\n"
"par_id3146896\n"
"help.text"
-msgid "If you want to use a different paragraph style as a table of contents entry, select the <item type=\"menuitem\">Additional Styles</item> check box in the <item type=\"menuitem\">Create from</item> area, and then click the <item type=\"menuitem\">Assign styles</item> button next to the check box. In the <item type=\"menuitem\">Assign Styles</item> dialog, click the style in the list, and then click the <item type=\"menuitem\">>></item> or the <item type=\"menuitem\"><<</item> button to define the chapter level for the paragraph style."
-msgstr "如果您希望目录条目使用不同的段落样式,请在「<item type=\"menuitem\">创建来源</item>」区域选中「<item type=\"menuitem\">其他样式</item>」复选框,然后点击该复选框旁边的「<item type=\"menuitem\">指定样式</item>」按钮。在「<item type=\"menuitem\">指定样式</item>」对话框中,点击列表中的样式,然后点击「<item type=\"menuitem\">>></item>」或「<item type=\"menuitem\"><<</item>」按钮来为段落样式。"
+msgid "If you want to use a different paragraph style as a table of contents entry, select the <menuitem>Additional Styles</menuitem> check box in the <menuitem>Create from</menuitem> area, and then click the <menuitem>Assign styles</menuitem> button next to the check box. In the <menuitem>Assign Styles</menuitem> dialog, click the style in the list, and then click the <menuitem>>></menuitem> or the <menuitem><<</menuitem> button to define the outline level for the paragraph style."
+msgstr ""
-#. a7Nyb
+#. mXE4E
#: indices_toc.xhp
msgctxt ""
"indices_toc.xhp\n"
"par_id1001574720273772\n"
"help.text"
-msgid "%PRODUCTNAME creates the table of contents entries based on the chapter level of the paragraph style and the paragraph contents. If the paragraph is empty, it will not be included in the table of contents. To force the empty paragraph to be listed in the table of contents, manually add a space or a non breaking space to the paragraph. Spaces added in the <emph>After</emph> text box of the Numbering tab in the Chapter Numbering dialog will not work for this purpose, since they are part of the paragraph numbering, not the paragraph contents."
+msgid "%PRODUCTNAME creates the table of contents entries based on the outline level of the paragraph style and the paragraph contents. If the paragraph is empty, it will not be included in the table of contents. To force the empty paragraph to be listed in the table of contents, manually add a space or a non breaking space to the paragraph. Spaces added in the <emph>After</emph> text box of the Numbering tab in the Chapter Numbering dialog will not work for this purpose, since they are part of the paragraph numbering, not the paragraph contents."
msgstr ""
#. Fdoe5
@@ -9619,32 +9628,32 @@ msgctxt ""
msgid "<bookmark_value>numbering; combining</bookmark_value> <bookmark_value>merging;numbered lists</bookmark_value> <bookmark_value>joining;numbered lists</bookmark_value> <bookmark_value>lists;combining numbered lists</bookmark_value> <bookmark_value>paragraphs;numbering non-consecutive</bookmark_value>"
msgstr "<bookmark_value>编号; 合并</bookmark_value><bookmark_value>合并;编号列表</bookmark_value><bookmark_value>连接;编号列表</bookmark_value><bookmark_value>列表;合并编号列表</bookmark_value><bookmark_value>段落;编号非连续</bookmark_value>"
-#. aUM78
+#. uwK2S
#: join_numbered_lists.xhp
msgctxt ""
"join_numbered_lists.xhp\n"
"hd_id3150495\n"
"help.text"
-msgid "<variable id=\"join_numbered_lists\"><link href=\"text/swriter/guide/join_numbered_lists.xhp\" name=\"Combining Numbered Lists\">Combining Numbered Lists</link></variable>"
-msgstr "<variable id=\"join_numbered_lists\"><link href=\"text/swriter/guide/join_numbered_lists.xhp\" name=\"Combining Numbered Lists\">合并编号列表</link></variable>"
+msgid "<variable id=\"join_numbered_lists\"><link href=\"text/swriter/guide/join_numbered_lists.xhp\" name=\"Combining Numbered Lists\">Combining Ordered Lists</link></variable>"
+msgstr ""
-#. ygDg8
+#. kFGF5
#: join_numbered_lists.xhp
msgctxt ""
"join_numbered_lists.xhp\n"
"par_id3149692\n"
"help.text"
-msgid "You can combine numbered lists into a single consecutively numbered list."
-msgstr "可以将多个编号列表合并成编号连续的单个列表。"
+msgid "You can combine two ordered lists into a single list."
+msgstr ""
-#. G4bPG
+#. 2mCAG
#: join_numbered_lists.xhp
msgctxt ""
"join_numbered_lists.xhp\n"
"hd_id3149452\n"
"help.text"
-msgid "To Combine Consecutive Numbered Lists"
-msgstr "合并连续编号的列表"
+msgid "To Combine Two Ordered Lists"
+msgstr ""
#. e25XR
#: join_numbered_lists.xhp
@@ -9655,23 +9664,23 @@ msgctxt ""
msgid "Select all of the paragraphs in the lists."
msgstr "选择各个列表中的所有段落。"
-#. FnnAw
+#. wTYyb
#: join_numbered_lists.xhp
msgctxt ""
"join_numbered_lists.xhp\n"
"par_id3155911\n"
"help.text"
-msgid "On the <item type=\"menuitem\">Formatting</item> Bar, click the <item type=\"menuitem\">Numbering On/Off</item> icon twice."
-msgstr "在「<item type=\"menuitem\">格式</item>」工具栏中,点击「<item type=\"menuitem\">编号打开/关闭</item>」图标两次。"
+msgid "On the <menuitem>Formatting</menuitem> Bar, click the <menuitem>Toggle Ordered List</menuitem> icon twice."
+msgstr ""
-#. huoiN
+#. yCERR
#: join_numbered_lists.xhp
msgctxt ""
"join_numbered_lists.xhp\n"
"hd_id3155870\n"
"help.text"
-msgid "To Create a Numbered List From Non-consecutive Paragraphs:"
-msgstr "从不连续的段落创建编号列表:"
+msgid "To Create a Ordered List From Non-consecutive Paragraphs"
+msgstr ""
#. 3fmSg
#: join_numbered_lists.xhp
@@ -9691,14 +9700,23 @@ msgctxt ""
msgid "Continue to hold down <switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline>, and drag a selection in each numbered paragraph of the lists you want to combine."
msgstr ""
-#. mLFjo
+#. RaZCA
#: join_numbered_lists.xhp
msgctxt ""
"join_numbered_lists.xhp\n"
"par_id3145102\n"
"help.text"
-msgid "On the <item type=\"menuitem\">Formatting</item> Bar, click the <item type=\"menuitem\">Numbering On/Off</item> icon twice."
-msgstr "在「<item type=\"menuitem\">格式</item>」工具栏中,点击「<item type=\"menuitem\">编号打开/关闭</item>」图标两次。"
+msgid "On the <menuitem>Formatting</menuitem> Bar, click the <menuitem>Toggle Ordered List</menuitem> icon twice."
+msgstr ""
+
+#. RNYoM
+#: join_numbered_lists.xhp
+msgctxt ""
+"join_numbered_lists.xhp\n"
+"par_id751615828987862\n"
+"help.text"
+msgid "To add selected paragraphs to an existing list, use <link href=\"text/swriter/02/add_to_list.xhp\" name=\"Add to List\"><menuitem>Format - Lists - Add to List</menuitem></link>."
+msgstr ""
#. rDMRb
#: jump2statusbar.xhp
@@ -10654,14 +10672,14 @@ msgctxt ""
msgid "All paragraph styles are based on the \"Default\" style."
msgstr "所有的段落样式都以「默认」样式为基础。"
-#. zxroA
+#. 6Bnc6
#: numbering_lines.xhp
msgctxt ""
"numbering_lines.xhp\n"
"par_id3150931\n"
"help.text"
-msgid "Click the <emph>Outline & Numbering</emph> tab."
-msgstr "点击「<emph>大纲 & 编号</emph>」选项卡。"
+msgid "Click the <emph>Outline & List</emph> tab."
+msgstr ""
#. kfFgy
#: numbering_lines.xhp
@@ -10744,14 +10762,14 @@ msgctxt ""
msgid "Click in a paragraph."
msgstr "在段落中点击。"
-#. En2MK
+#. pvF59
#: numbering_lines.xhp
msgctxt ""
"numbering_lines.xhp\n"
"par_id3150721\n"
"help.text"
-msgid "Choose <item type=\"menuitem\">Format - Paragraph</item>, and then click the <item type=\"menuitem\">Outline & Numbering</item> tab."
-msgstr "选择「<item type=\"menuitem\">格式 - 段落</item>」,然后点击「<item type=\"menuitem\">大纲 & 编号</item>」选项卡。"
+msgid "Choose <menuitem>Format - Paragraph</menuitem>, and then click the <menuitem>Outline & List</menuitem> tab."
+msgstr ""
#. DB5Bp
#: numbering_lines.xhp
@@ -10798,14 +10816,14 @@ msgctxt ""
msgid "<link href=\"text/swriter/01/06180000.xhp\" name=\"Tools - Line Numbering\">Tools - Line Numbering</link>"
msgstr "<link href=\"text/swriter/01/06180000.xhp\" name=\"工具 - 行编号\">工具 - 行编号</link>"
-#. y2EtS
+#. PG4ys
#: numbering_lines.xhp
msgctxt ""
"numbering_lines.xhp\n"
"par_id3153960\n"
"help.text"
-msgid "<link href=\"text/swriter/01/05030800.xhp\" name=\"Format - Paragraph - Numbering\">Format - Paragraph - Numbering</link>"
-msgstr "<link href=\"text/swriter/01/05030800.xhp\" name=\"格式 - 段落 - 编号\">格式 - 段落 - 编号</link>"
+msgid "Format - Paragraph - <embedvar href=\"text/swriter/01/05030800.xhp#outlinelisth1\"/>"
+msgstr ""
#. foq8S
#: numbering_lines.xhp
@@ -10816,14 +10834,14 @@ msgctxt ""
msgid "<link href=\"https://wiki.documentfoundation.org/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings\" name=\"wiki.documentfoundation.org Setting up a Style for Numbering Lines in Code Listings\">Wiki page about numbering paragraphs by styles</link>"
msgstr "<link href=\"https://wiki.documentfoundation.org/Documentation/How_Tos/Setting_up_a_Style_for_Numbering_Lines_in_Code_Listings\" name=\"wiki.documentfoundation.org Setting up a Style for Numbering Lines in Code Listings\">关于使用样式为段落编号的 wiki 页面</link>"
-#. PngCd
+#. EQANu
#: numbering_paras.xhp
msgctxt ""
"numbering_paras.xhp\n"
"tit\n"
"help.text"
-msgid "Modifying Numbering in a Numbered List"
-msgstr "修改编号列表中的编号"
+msgid "Modifying Numbering in an Ordered List"
+msgstr ""
#. CZCFE
#: numbering_paras.xhp
@@ -10834,41 +10852,32 @@ msgctxt ""
msgid "<bookmark_value>numbering; removing/interrupting</bookmark_value> <bookmark_value>bullet lists; interrupting</bookmark_value> <bookmark_value>lists;removing/interrupting numbering</bookmark_value> <bookmark_value>deleting;numbers in lists</bookmark_value> <bookmark_value>interrupting numbered lists</bookmark_value> <bookmark_value>changing;starting numbers in lists</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>"
-#. vsLZ8
+#. wER6G
#: numbering_paras.xhp
msgctxt ""
"numbering_paras.xhp\n"
"hd_id3149637\n"
"help.text"
-msgid "<variable id=\"numbering_paras\"><link href=\"text/swriter/guide/numbering_paras.xhp\" name=\"Modifying Numbering in a Numbered List\">Modifying Numbering in a Numbered List</link></variable>"
-msgstr "<variable id=\"numbering_paras\"><link href=\"text/swriter/guide/numbering_paras.xhp\" name=\"修改编号列表中的编号\">修改编号列表中的编号</link></variable>"
+msgid "<variable id=\"numbering_paras\"><link href=\"text/swriter/guide/numbering_paras.xhp\" name=\"Modifying Numbering in a Numbered List\">Modifying Numbering in an Ordered List</link></variable>"
+msgstr ""
-#. UkDzC
+#. eP9Ei
#: numbering_paras.xhp
msgctxt ""
"numbering_paras.xhp\n"
"par_id3145092\n"
"help.text"
-msgid "You can remove the numbering from a paragraph in a numbered list or change the number that a numbered list starts with."
-msgstr "在编号列表中,您可以删除段落的编号,或者修改编号列表的起始编号。"
-
-#. 4arAA
-#: numbering_paras.xhp
-msgctxt ""
-"numbering_paras.xhp\n"
-"par_id2172612\n"
-"help.text"
-msgid "If you want numbered headings, use the <menuitem>Tools - Chapter Numbering</menuitem> menu command to assign a numbering to a paragraph style. Do not use the Numbering icon on the Formatting toolbar."
+msgid "You can remove the numbering from a paragraph in an ordered list or change the number that an ordered list starts with."
msgstr ""
-#. XdFDM
+#. o2d3C
#: numbering_paras.xhp
msgctxt ""
"numbering_paras.xhp\n"
"hd_id3145107\n"
"help.text"
-msgid "To Remove the Number From a Paragraph in a Numbered List"
-msgstr "删除编号列表中段落的编号"
+msgid "To Remove the Number From a Paragraph in an Ordered List"
+msgstr ""
#. Bdddz
#: numbering_paras.xhp
@@ -10897,32 +10906,32 @@ msgctxt ""
msgid "To remove the number while preserving the indent of the paragraph, press the Backspace key."
msgstr "要在保留段落缩进的同时移除数字,请按「退格」键。"
-#. vpCsg
+#. cszDd
#: numbering_paras.xhp
msgctxt ""
"numbering_paras.xhp\n"
"par_id3154248\n"
"help.text"
-msgid "To remove the number and the indent of the paragraph, click the <emph>Numbering on/off</emph> icon on the <emph>Formatting</emph> Bar. If you save the document in HTML format, a separate numbered list is created for the numbered paragraphs that follow the current paragraph."
-msgstr "要同时移除数字与段落缩进,请点击「<emph>格式</emph>」工具栏的「<emph>编号打开/关闭</emph>」图标。如果您以 HTML 格式保存文档,将为当前段落后的已编号段落创建单独的编号列表。"
+msgid "To remove the number and the indent of the paragraph, click the <emph>No List</emph> icon on the <emph>Formatting</emph> Bar. If you save the document in HTML format, a separate numbered list is created for the numbered paragraphs that follow the current paragraph."
+msgstr ""
-#. dHiFt
+#. 4sN9H
#: numbering_paras.xhp
msgctxt ""
"numbering_paras.xhp\n"
"hd_id3154856\n"
"help.text"
-msgid "To Change the Number That a Numbered List Starts With"
-msgstr "修改编号列表的起始编号"
+msgid "To Change the Number That an Ordered List Starts With"
+msgstr ""
-#. s3SHA
+#. rgBxU
#: numbering_paras.xhp
msgctxt ""
"numbering_paras.xhp\n"
"par_id3155877\n"
"help.text"
-msgid "Click anywhere in the numbered list."
-msgstr "点击编号列表中的任意位置。"
+msgid "Click anywhere in the ordered list."
+msgstr ""
#. Nkqj8
#: numbering_paras.xhp
@@ -12085,14 +12094,14 @@ msgctxt ""
msgid "Creating and Applying Page Styles"
msgstr "创建和应用页面样式"
-#. BFGvL
+#. fPbBS
#: pagestyles.xhp
msgctxt ""
"pagestyles.xhp\n"
"bm_id7071138\n"
"help.text"
-msgid "<bookmark_value>page styles;creating and applying</bookmark_value> <bookmark_value>defining;page styles</bookmark_value> <bookmark_value>styles;for pages</bookmark_value>"
-msgstr "<bookmark_value>页面样式; 创建和应用</bookmark_value><bookmark_value>定义; 页面样式</bookmark_value><bookmark_value>样式; 用于页面</bookmark_value>"
+msgid "<bookmark_value>page styles;creating and applying</bookmark_value> <bookmark_value>defining;page styles</bookmark_value> <bookmark_value>styles;for pages</bookmark_value> <bookmark_value>overriding next style;for pages</bookmark_value>"
+msgstr ""
#. MM4EQ
#: pagestyles.xhp
@@ -12211,6 +12220,15 @@ msgctxt ""
msgid "Click in the page that you want to apply the page style to."
msgstr "在要应用页面样式的页面中点击。"
+#. vF8n9
+#: pagestyles.xhp
+msgctxt ""
+"pagestyles.xhp\n"
+"par_id471615462517274\n"
+"help.text"
+msgid "Do one of the following:"
+msgstr ""
+
#. GC7eD
#: pagestyles.xhp
msgctxt ""
@@ -12229,6 +12247,78 @@ msgctxt ""
msgid "Double-click a name in the list."
msgstr "双击列表中的名称。"
+#. wAew8
+#: pagestyles.xhp
+msgctxt ""
+"pagestyles.xhp\n"
+"par_id891615460923756\n"
+"help.text"
+msgid "Right-click the page style displayed in the <link href=\"text/shared/01/03060000\" name=\"Status Bar\">Status Bar</link>. Select another page style."
+msgstr ""
+
+#. ombta
+#: pagestyles.xhp
+msgctxt ""
+"pagestyles.xhp\n"
+"hd_id181615419889677\n"
+"help.text"
+msgid "To Manually Override the “Next style” of a Page Style"
+msgstr ""
+
+#. mX6AF
+#: pagestyles.xhp
+msgctxt ""
+"pagestyles.xhp\n"
+"par_id601615419994433\n"
+"help.text"
+msgid "Place cursor between the page with the page style and the page with the style specified in <emph>Next style</emph>."
+msgstr ""
+
+#. V4dVd
+#: pagestyles.xhp
+msgctxt ""
+"pagestyles.xhp\n"
+"par_id301615420000676\n"
+"help.text"
+msgid "Right-click and choose <menuitem>Edit Page Break</menuitem>."
+msgstr ""
+
+#. rsZHm
+#: pagestyles.xhp
+msgctxt ""
+"pagestyles.xhp\n"
+"par_id271615420006519\n"
+"help.text"
+msgid "Select the <emph>With page style</emph> checkbox."
+msgstr ""
+
+#. wdCZW
+#: pagestyles.xhp
+msgctxt ""
+"pagestyles.xhp\n"
+"par_id601615420013170\n"
+"help.text"
+msgid "Enter the page style to be applied."
+msgstr ""
+
+#. Fcn83
+#: pagestyles.xhp
+msgctxt ""
+"pagestyles.xhp\n"
+"par_id231615420303511\n"
+"help.text"
+msgid "See <link href=\"text/swriter/guide/pageorientation.xhp#scope\" name=\"Next Style\">Manually Defined Range of a Page style</link>."
+msgstr ""
+
+#. 2BGUb
+#: pagestyles.xhp
+msgctxt ""
+"pagestyles.xhp\n"
+"par_id891615463137607\n"
+"help.text"
+msgid "A special situation arises when a <emph>Next style</emph> is different than the page style itself, and you want to apply that page style to two consecutive pages. For example, if you have applied <emph>First Page</emph> style to a page, and want to apply First Page style again to the immediately following page, then you must manually override First Page style, because it is configured to be followed by <emph>Default Page Style</emph>."
+msgstr ""
+
#. enqf2
#: pagestyles.xhp
msgctxt ""
@@ -18322,14 +18412,14 @@ msgctxt ""
msgid "Adding Bullets"
msgstr "添加项目符号"
-#. npXYA
+#. 6sLBy
#: using_numbered_lists.xhp
msgctxt ""
"using_numbered_lists.xhp\n"
"bm_id3155186\n"
"help.text"
-msgid "<bookmark_value>bullet lists;turning on and off</bookmark_value> <bookmark_value>paragraphs; bulleted</bookmark_value> <bookmark_value>bullets;adding and editing</bookmark_value> <bookmark_value>formatting;bullets</bookmark_value> <bookmark_value>removing;bullets in text documents</bookmark_value> <bookmark_value>changing;bulleting symbols</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>unordered lists;turning on and off</bookmark_value> <bookmark_value>paragraphs; bulleted</bookmark_value> <bookmark_value>bullets;adding and editing</bookmark_value> <bookmark_value>formatting;bullets</bookmark_value> <bookmark_value>removing;bullets in text documents</bookmark_value> <bookmark_value>changing;bulleting symbols</bookmark_value>"
+msgstr ""
#. fHxYh
#: using_numbered_lists.xhp
@@ -18358,23 +18448,23 @@ msgctxt ""
msgid "Select the paragraph(s) that you want to add bullets to."
msgstr "选择要添加项目符号的段落。"
-#. SjDdr
+#. qaN2Z
#: using_numbered_lists.xhp
msgctxt ""
"using_numbered_lists.xhp\n"
"par_id3149635\n"
"help.text"
-msgid "On the <item type=\"menuitem\">Formatting</item> Bar, click the <item type=\"menuitem\">Bullets On/Off</item> icon <image id=\"img_id3156108\" src=\"cmd/sc_defaultbullet.png\" width=\"0.423cm\" height=\"0.423cm\"><alt id=\"alt_id3156108\">Icon</alt></image> (Shift-F12)."
+msgid "On the <menuitem>Formatting</menuitem> Bar, click the <menuitem>Toggle Unordered List</menuitem> icon (<keycode>Shift+F12</keycode>)."
msgstr ""
-#. fd4ap
+#. nQCke
#: using_numbered_lists.xhp
msgctxt ""
"using_numbered_lists.xhp\n"
"par_id3145403\n"
"help.text"
-msgid "To remove bullets, select the bulleted paragraphs, and then click the <emph>Bullets On/Off</emph> icon on the <emph>Formatting</emph> Bar."
-msgstr "要删除项目符号,请选择带有项目符号的段落,然后点击「<emph>格式</emph>」工具栏上的「<emph>项目符号打开/关闭</emph>」图标。"
+msgid "To remove bullets, select the bulleted paragraphs, and then click the <emph>Toggle Unordered List</emph> icon on the <emph>Formatting</emph> Bar."
+msgstr ""
#. HpLDk
#: using_numbered_lists.xhp
@@ -18385,22 +18475,22 @@ msgctxt ""
msgid "To Format Bullets"
msgstr "设置项目符号的格式"
-#. eLxDt
+#. gUFZk
#: using_numbered_lists.xhp
msgctxt ""
"using_numbered_lists.xhp\n"
"par_id3154416\n"
"help.text"
-msgid "To change the formatting of a bulleted list, choose <item type=\"menuitem\">Format - Bullets and Numbering</item>."
-msgstr "要修改项目符号列表的格式,请选择「<item type=\"menuitem\">格式 - 项目符号与编号</item>」。"
+msgid "To change the formatting of an unordered list, choose <menuitem>Format - Bullets and Numbering</menuitem>."
+msgstr ""
-#. wyMSC
+#. qZ6Zu
#: using_numbered_lists.xhp
msgctxt ""
"using_numbered_lists.xhp\n"
"par_id3153390\n"
"help.text"
-msgid "Click on the <item type=\"menuitem\">Bullet</item> tab or the <item type=\"menuitem\">Image</item> tab, and then select a symbol style in the <item type=\"menuitem\">Selection</item> area."
+msgid "Click on the <menuitem>Unordered</menuitem> tab or the <menuitem>Image</menuitem> tab, and then select a symbol style in the <menuitem>Selection</menuitem> area."
msgstr ""
#. XtKb5
@@ -18421,14 +18511,14 @@ msgctxt ""
msgid "Adding Numbering"
msgstr "添加编号"
-#. UTBpr
+#. pGetS
#: using_numbered_lists2.xhp
msgctxt ""
"using_numbered_lists2.xhp\n"
"bm_id3147418\n"
"help.text"
-msgid "<bookmark_value>numbering;paragraphs, on and off</bookmark_value> <bookmark_value>paragraphs; numbering on/off</bookmark_value> <bookmark_value>formatting;numbered lists</bookmark_value> <bookmark_value>inserting;numbering</bookmark_value>"
-msgstr "<bookmark_value>编号; 段落,打开和关闭</bookmark_value><bookmark_value>段落; 编号打开/关闭</bookmark_value><bookmark_value>格式; 编号列表</bookmark_value><bookmark_value>插入; 编号</bookmark_value>"
+msgid "<bookmark_value>numbering;paragraphs, on and off</bookmark_value> <bookmark_value>paragraphs;toggle ordered list</bookmark_value> <bookmark_value>formatting;ordered lists</bookmark_value> <bookmark_value>inserting;numbering</bookmark_value>"
+msgstr ""
#. ZPrUH
#: using_numbered_lists2.xhp
@@ -18457,76 +18547,112 @@ msgctxt ""
msgid "Select the paragraph(s) that you want to add numbering to."
msgstr "选择要添加编号的段落。"
-#. TZrEV
+#. PAGDn
+#: using_numbered_lists2.xhp
+msgctxt ""
+"using_numbered_lists2.xhp\n"
+"par_id181615764064889\n"
+"help.text"
+msgid "Do one of the following:"
+msgstr ""
+
+#. B2NZk
#: using_numbered_lists2.xhp
msgctxt ""
"using_numbered_lists2.xhp\n"
"par_id3149968\n"
"help.text"
-msgid "On the <emph>Formatting</emph> Bar, click the <emph>Toggle Numbered List</emph> icon (<keycode>F12</keycode>)."
+msgid "On the <emph>Formatting</emph> Bar, click the <emph>Toggle Ordered List</emph> icon (<keycode>F12</keycode>)"
msgstr ""
-#. seYCG
+#. dpmx5
#: using_numbered_lists2.xhp
msgctxt ""
"using_numbered_lists2.xhp\n"
-"par_id3149573\n"
+"par_id211615764184529\n"
"help.text"
-msgid "To change the formatting and the hierarchy of a numbered list, click in the list, and then open the <emph>Bullets and Numbering</emph> toolbar."
-msgstr "要修改编号列表的格式和分层结构,请点击列表,然后打开「<emph>项目符号与编号</emph>」工具栏。"
+msgid "Right-click, choose <menuitem>Lists</menuitem>, then select a list style."
+msgstr ""
-#. cBsKj
+#. dQ6VP
#: using_numbered_lists2.xhp
msgctxt ""
"using_numbered_lists2.xhp\n"
-"par_id91611756820703\n"
+"par_id941615766439690\n"
"help.text"
-msgid "<image src=\"cmd/lc_defaultnumbering.png\" id=\"img_id531611756820703\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id961611756820703\">Toggle Numbered List Icon</alt></image>"
+msgid "A <link href=\"text/swriter/guide/using_numbering.xhp\" name=\"Paragraph Style\">paragraph style</link> can be configured to add numbering."
msgstr ""
-#. 8rCsx
+#. 96JB9
#: using_numbered_lists2.xhp
msgctxt ""
"using_numbered_lists2.xhp\n"
-"par_id141611756820703\n"
+"hd_id861615765870820\n"
"help.text"
-msgid "Toggle Numbered List"
+msgid "To Remove Paragraphs from an Ordered List"
msgstr ""
-#. 4KDug
+#. PwFjK
#: using_numbered_lists2.xhp
msgctxt ""
"using_numbered_lists2.xhp\n"
"par_id3153365\n"
"help.text"
-msgid "To remove numbering, select the numbered paragraphs, and then click the <emph>Toggle Numbered List</emph> icon on the <emph>Formatting</emph> Bar."
+msgid "To remove numbering, select the numbered paragraphs, then click the <emph>Toggle Ordered List</emph> icon or the <emph>No List</emph> icon on the <emph>Formatting</emph> Bar."
msgstr ""
-#. SWoqA
+#. iFCsz
#: using_numbered_lists2.xhp
msgctxt ""
"using_numbered_lists2.xhp\n"
"hd_id3154233\n"
"help.text"
-msgid "To Format a Numbered List"
-msgstr "设置编号列表的格式"
+msgid "To Format an Ordered List"
+msgstr ""
-#. AXMM3
+#. XpCAC
#: using_numbered_lists2.xhp
msgctxt ""
"using_numbered_lists2.xhp\n"
"par_id3154246\n"
"help.text"
-msgid "To change the formatting of a numbered list, click in the list, then choose <emph>Format - Bullets and Numbering</emph>."
-msgstr "要修改编号列表的格式,请点击此列表,然后选择「<emph>格式 - 项目符号与编号</emph>」。"
+msgid "To change the formatting of a numbered list, do one of the following:"
+msgstr ""
+
+#. ctBEK
+#: using_numbered_lists2.xhp
+msgctxt ""
+"using_numbered_lists2.xhp\n"
+"par_id801615765243022\n"
+"help.text"
+msgid "Click in the list, then choose <menuitem>Format - Bullets and Numbering</menuitem>."
+msgstr ""
+
+#. ThdUE
+#: using_numbered_lists2.xhp
+msgctxt ""
+"using_numbered_lists2.xhp\n"
+"par_id161615765280165\n"
+"help.text"
+msgid "Right-click in the list, then choose <menuitem>Lists - Bullets and Numbering</menuitem>."
+msgstr ""
+
+#. xgmVR
+#: using_numbered_lists2.xhp
+msgctxt ""
+"using_numbered_lists2.xhp\n"
+"par_id3149573\n"
+"help.text"
+msgid "To change the hierarchy of an ordered list, click in the list, then use the icons in the <emph>Bullets and Numbering</emph> toolbar."
+msgstr ""
-#. 9MZVK
+#. y2KEo
#: using_numbered_lists2.xhp
msgctxt ""
"using_numbered_lists2.xhp\n"
"par_id21611757614734\n"
"help.text"
-msgid "Copying or moving an item from a numbered list to a new location continues the list numbering. To start a new numbering with the pasted item, click <emph>Toggle Numbered List</emph> twice."
+msgid "Copying or moving an item from a numbered list to a new location continues the list numbering. To start a new numbering with the pasted item, click <emph>Toggle Ordered List</emph> twice. Any formatting on the pasted item is reset to default."
msgstr ""
#. MAprK