aboutsummaryrefslogtreecommitdiff
path: root/source/zh-TW/helpcontent2
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2021-10-25 14:05:31 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2021-10-25 14:07:25 +0200
commit41974fc7ebdc4d8d6d8d017a6e68753fd5a049e3 (patch)
tree52902153ff1ffada5061b2c5ecbe6afde9c3315c /source/zh-TW/helpcontent2
parent26c743b6e210606f1d10d34439d2073ca2140ed6 (diff)
update translations for master
and force-fix errors using pocheck Change-Id: Ic6888555f22c4e961c0734fa685969b43f89c02e
Diffstat (limited to 'source/zh-TW/helpcontent2')
-rw-r--r--source/zh-TW/helpcontent2/source/auxiliary.po11
-rw-r--r--source/zh-TW/helpcontent2/source/text/sbasic/guide.po344
-rw-r--r--source/zh-TW/helpcontent2/source/text/sbasic/python.po120
-rw-r--r--source/zh-TW/helpcontent2/source/text/sbasic/shared.po746
-rw-r--r--source/zh-TW/helpcontent2/source/text/sbasic/shared/03.po26
-rw-r--r--source/zh-TW/helpcontent2/source/text/scalc.po8
-rw-r--r--source/zh-TW/helpcontent2/source/text/scalc/01.po438
-rw-r--r--source/zh-TW/helpcontent2/source/text/scalc/guide.po36
-rw-r--r--source/zh-TW/helpcontent2/source/text/sdatabase.po1533
-rw-r--r--source/zh-TW/helpcontent2/source/text/sdraw.po11
-rw-r--r--source/zh-TW/helpcontent2/source/text/sdraw/00.po15
-rw-r--r--source/zh-TW/helpcontent2/source/text/sdraw/01.po6
-rw-r--r--source/zh-TW/helpcontent2/source/text/shared/00.po20
-rw-r--r--source/zh-TW/helpcontent2/source/text/shared/01.po282
-rw-r--r--source/zh-TW/helpcontent2/source/text/shared/explorer/database.po1485
-rw-r--r--source/zh-TW/helpcontent2/source/text/shared/guide.po119
-rw-r--r--source/zh-TW/helpcontent2/source/text/shared/optionen.po22
-rw-r--r--source/zh-TW/helpcontent2/source/text/simpress/00.po15
-rw-r--r--source/zh-TW/helpcontent2/source/text/simpress/01.po201
-rw-r--r--source/zh-TW/helpcontent2/source/text/simpress/guide.po52
-rw-r--r--source/zh-TW/helpcontent2/source/text/swriter.po20
-rw-r--r--source/zh-TW/helpcontent2/source/text/swriter/00.po72
-rw-r--r--source/zh-TW/helpcontent2/source/text/swriter/01.po165
-rw-r--r--source/zh-TW/helpcontent2/source/text/swriter/02.po6
-rw-r--r--source/zh-TW/helpcontent2/source/text/swriter/guide.po198
25 files changed, 3727 insertions, 2224 deletions
diff --git a/source/zh-TW/helpcontent2/source/auxiliary.po b/source/zh-TW/helpcontent2/source/auxiliary.po
index 32eab34e14f..e0ffb90118f 100644
--- a/source/zh-TW/helpcontent2/source/auxiliary.po
+++ b/source/zh-TW/helpcontent2/source/auxiliary.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-10 23:11+0200\n"
+"POT-Creation-Date: 2021-10-20 13:08+0200\n"
"PO-Revision-Date: 2020-01-24 14:44+0000\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: Chinese (Traditional) <https://weblate.documentfoundation.org/projects/libo_help-master/auxiliary/zh_Hant/>\n"
@@ -304,6 +304,15 @@ msgctxt ""
msgid "Protection"
msgstr "保護"
+#. m2Dpj
+#: scalc.tree
+msgctxt ""
+"scalc.tree\n"
+"0815\n"
+"node.text"
+msgid "Writing Calc Macros"
+msgstr ""
+
#. Q59GN
#: scalc.tree
msgctxt ""
diff --git a/source/zh-TW/helpcontent2/source/text/sbasic/guide.po b/source/zh-TW/helpcontent2/source/text/sbasic/guide.po
index 9e8e23024d0..27c23f2eb4f 100644
--- a/source/zh-TW/helpcontent2/source/text/sbasic/guide.po
+++ b/source/zh-TW/helpcontent2/source/text/sbasic/guide.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-20 13:02+0200\n"
+"POT-Creation-Date: 2021-10-20 13:08+0200\n"
"PO-Revision-Date: 2018-04-25 12:44+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1249,6 +1249,348 @@ msgctxt ""
msgid "On the dialog, drag the button to the size you want."
msgstr "在對話方塊上,拖曳滑鼠直至按鈕達到所需的大小。"
+#. fRi68
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"tit\n"
+"help.text"
+msgid "Reading and Writing values to Ranges"
+msgstr ""
+
+#. 3hH3s
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"hd_id461623364876507\n"
+"help.text"
+msgid "<variable id=\"title\"><link href=\"text/sbasic/guide/read_write_values.xhp\" name=\"ReadWriteValues_h1\">Reading and Writing values to Ranges</link></variable>"
+msgstr ""
+
+#. ZKUBE
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id781633210592228\n"
+"help.text"
+msgid "Macros in %PRODUCTNAME Calc often need to read and write values from/to sheets. This help page describes the various approaches to accessing sheets and ranges to read or write their values."
+msgstr ""
+
+#. D4ZJu
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id191633214565965\n"
+"help.text"
+msgid "All examples presented in this page can be implemented both in Basic and Python."
+msgstr ""
+
+#. LfNCy
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"hd_id331633213558740\n"
+"help.text"
+msgid "Accessing a Single Cell"
+msgstr ""
+
+#. A5M3f
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id731633213581386\n"
+"help.text"
+msgid "The example below enters the numeric value 123 into cell \"A1\" of the current sheet."
+msgstr ""
+
+#. G6yWX
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id131633213887433\n"
+"help.text"
+msgid "The same can be accomplished with Python:"
+msgstr ""
+
+#. CDmg6
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id861633214219511\n"
+"help.text"
+msgid "Note that in the previous examples the cell is accessed using its range name \"A1\". It is also possible to access cells using indices as though the sheet were a matrix where columns and rows are indexed starting from zero."
+msgstr ""
+
+#. Jja4D
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id161633214461067\n"
+"help.text"
+msgid "This can be done using the <literal>getCellByPosition(colIndex, rowIndex)</literal> method, that takes in a column and a row index. The example below in Basic changes the text value in cell \"C1\" (column 2, row 0)."
+msgstr ""
+
+#. 5tsZR
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id221633214713436\n"
+"help.text"
+msgid "This example can also be implemented in Python as follows:"
+msgstr ""
+
+#. h6eq5
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id101633215142970\n"
+"help.text"
+msgid "The main difference between Python and Basic scripts lies on how to get access to the sheet object by using the <literal>XSCRIPTCONTEXT</literal> context variable. After that, all methods and properties are identical in Basic and Python."
+msgstr ""
+
+#. PmETF
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"hd_id411633215666257\n"
+"help.text"
+msgid "Values, Strings and Formulas"
+msgstr ""
+
+#. MBHDg
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id861633215682610\n"
+"help.text"
+msgid "Calc cells can have three types of values: numeric, strings and formulas. Each type has its own set and get methods:"
+msgstr ""
+
+#. RXE76
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id191633215791905\n"
+"help.text"
+msgid "Type"
+msgstr ""
+
+#. rYCuZ
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id181633215791905\n"
+"help.text"
+msgid "Numeric"
+msgstr ""
+
+#. ywHfC
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id961633215932180\n"
+"help.text"
+msgid "Text"
+msgstr ""
+
+#. KH9Ya
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id651633215984116\n"
+"help.text"
+msgid "Formula"
+msgstr ""
+
+#. nGhov
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id21633215845395\n"
+"help.text"
+msgid "Dates and currency values are considered as numeric values in Calc."
+msgstr ""
+
+#. t87Qx
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id221633216111353\n"
+"help.text"
+msgid "The following example enters numeric values into cells \"A1\" and \"A2\" and inserts a formula in cell \"A3\" that returns the multiplication of these values."
+msgstr ""
+
+#. r6BG6
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"hd_id321633216630043\n"
+"help.text"
+msgid "Accessing Ranges in Different Sheets"
+msgstr ""
+
+#. TFU8U
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id371633216672570\n"
+"help.text"
+msgid "The previous examples used only the active sheet to perform operations. It is possible to access cell ranges in different sheets by their indices or names."
+msgstr ""
+
+#. c3yhF
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id861633216843382\n"
+"help.text"
+msgid "The example below enters a numeric value into cell \"A1\" of the sheet named \"Sheet2\"."
+msgstr ""
+
+#. GpnNS
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id611633217090743\n"
+"help.text"
+msgid "This example can also be implemented in Python as follows:"
+msgstr ""
+
+#. xGQ3k
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id631633217279518\n"
+"help.text"
+msgid "Sheets can also be accessed using zero-based indices indicating which sheet considering the order they appear in the Calc file."
+msgstr ""
+
+#. tSo3e
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id291633264880172\n"
+"help.text"
+msgid "In Basic, instead of using the <literal>getByName</literal> method, use <literal>Sheets(sheetIndex)</literal> as shown next:"
+msgstr ""
+
+#. svDuj
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id891633265000047\n"
+"help.text"
+msgid "This can be done in a similar fashion in Python:"
+msgstr ""
+
+#. 6qHAn
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"hd_id451633265241066\n"
+"help.text"
+msgid "Using the ScriptForge Library"
+msgstr ""
+
+#. 8CkSe
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id731633265268585\n"
+"help.text"
+msgid "The Calc service of the ScriptForge library can be used to get and set cell values as follows:"
+msgstr ""
+
+#. DCJ2E
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id551633265526538\n"
+"help.text"
+msgid "' Loads the ScriptForge library"
+msgstr ""
+
+#. hgDyM
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id581633265527001\n"
+"help.text"
+msgid "' Gets access to the current Calc document"
+msgstr ""
+
+#. Gw4KG
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id751633265527427\n"
+"help.text"
+msgid "' Sets the value of cells A1 and A2"
+msgstr ""
+
+#. VUWVE
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id781633267324929\n"
+"help.text"
+msgid "The <literal>setValue</literal> method can be used to set both numeric and text values. To set a cell formula, use the <literal>setFormula</literal> method."
+msgstr ""
+
+#. jPRii
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id251633265634883\n"
+"help.text"
+msgid "With the Calc service, getting and setting cell values can be done with a single line of code. The example below gets the value from cell \"A1\" and shows it on a message box."
+msgstr ""
+
+#. NzUg4
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id521633608223310\n"
+"help.text"
+msgid "The ScriptForge library also makes it simpler to access ranges in different sheets, as demonstrated in the example below:"
+msgstr ""
+
+#. CCeEh
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"bas_id521633608366292\n"
+"help.text"
+msgid "' Gets cell \"A1\" from the sheet named \"Sheet1\""
+msgstr ""
+
+#. qUTqA
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"bas_id661633608366484\n"
+"help.text"
+msgid "' Gets cell \"B3\" from the sheet named \"Sheet2\""
+msgstr ""
+
+#. mCX5W
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"bas_id501633608516381\n"
+"help.text"
+msgid "' Places the result into cell \"A1\" of sheet \"Report\""
+msgstr ""
+
+#. ZdkEz
+#: read_write_values.xhp
+msgctxt ""
+"read_write_values.xhp\n"
+"par_id431633266057163\n"
+"help.text"
+msgid "The examples above can also be implemented in Python as follows:"
+msgstr ""
+
#. ayg6P
#: sample_code.xhp
msgctxt ""
diff --git a/source/zh-TW/helpcontent2/source/text/sbasic/python.po b/source/zh-TW/helpcontent2/source/text/sbasic/python.po
index 57a0c0ab703..b3951c7b4d6 100644
--- a/source/zh-TW/helpcontent2/source/text/sbasic/python.po
+++ b/source/zh-TW/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-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-25 12:48+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -580,13 +580,13 @@ msgctxt ""
msgid "Monitoring Document Events"
msgstr ""
-#. SZGH4
+#. VwSwW
#: python_document_events.xhp
msgctxt ""
"python_document_events.xhp\n"
"N0530\n"
"help.text"
-msgid "Monitoring is illustrated herewith for Basic and Python languages using object-oriented programming. Assigning <literal>OnLoad</literal> script, to the <emph>Open Document</emph> event, suffices to initiate and terminate document event monitoring. <menuitem>Tools - Customize</menuitem> menu <menuitem>Events</menuitem> tab is used to assign either scripts."
+msgid "Monitoring is illustrated herewith for Basic and Python languages using object-oriented programming. Assigning <literal>OnLoad</literal> script, to the <menuitem>Open Document</menuitem> event, suffices to initiate and terminate document event monitoring. <menuitem>Tools - Customize</menuitem> menu <menuitem>Events</menuitem> tab is used to assign either scripts."
msgstr ""
#. KgWvt
@@ -625,13 +625,13 @@ msgctxt ""
msgid "Events monitoring starts from object instantiation and ultimately stops when Python releases the object. Raised events are reported using <literal>Access2Base</literal> console."
msgstr ""
-#. D2HXF
+#. mCDwK
#: python_document_events.xhp
msgctxt ""
"python_document_events.xhp\n"
"N0534\n"
"help.text"
-msgid "<literal>OnLoad</literal> and <literal>OnUnload</literal> events can be used to respectively set and unset Python programs path. They are described as <emph>Open document</emph> and <emph>Document closed</emph>."
+msgid "<literal>OnLoad</literal> and <literal>OnUnload</literal> events can be used to respectively set and unset Python programs path. They are described as <menuitem>Open document</menuitem> and <menuitem>Document closed</menuitem>."
msgstr ""
#. AdYNb
@@ -805,6 +805,15 @@ msgctxt ""
msgid "def OnLoad(*args): # 'Open Document' event"
msgstr ""
+#. PmjAB
+#: python_document_events.xhp
+msgctxt ""
+"python_document_events.xhp\n"
+"N0602\n"
+"help.text"
+msgid "listener = UiDocument() # Initiates listening"
+msgstr ""
+
#. CkJg4
#: python_document_events.xhp
msgctxt ""
@@ -868,6 +877,15 @@ msgctxt ""
msgid "\"\"\" Display console content/dialog \"\"\""
msgstr ""
+#. mPJ3B
+#: python_document_events.xhp
+msgctxt ""
+"python_document_events.xhp\n"
+"N0638\n"
+"help.text"
+msgid "''' Grab application-based Basic script '''"
+msgstr ""
+
#. 2dfeg
#: python_document_events.xhp
msgctxt ""
@@ -877,13 +895,13 @@ msgctxt ""
msgid "Mind the misspelled <literal>documentEventOccured</literal> method that inherits a typo from %PRODUCTNAME Application Programming Interface (API)."
msgstr ""
-#. CuAga
+#. qNVD4
#: python_document_events.xhp
msgctxt ""
"python_document_events.xhp\n"
"N0648\n"
"help.text"
-msgid "<emph>Start application</emph> and <emph>Close application</emph> events can respectively be used to set and to unset Python path for user scripts or %PRODUCTNAME scripts. In a similar fashion, document based Python libraries or modules can be loaded and released using <emph>Open document</emph> and <emph>Document closed</emph> events. Refer to <link href=\"text/sbasic/python/python_import.xhp\" name=\"Importing Python Modules\">Importing Python Modules</link> for more information."
+msgid "<menuitem>Start application</menuitem> and <menuitem>Close application</menuitem> events can respectively be used to set and to unset Python path for user scripts or %PRODUCTNAME scripts. In a similar fashion, document based Python libraries or modules can be loaded and released using <menuitem>Open document</menuitem> and <menuitem>Document closed</menuitem> events. Refer to <link href=\"text/sbasic/python/python_import.xhp\" name=\"Importing Python Modules\">Importing Python Modules</link> for more information."
msgstr ""
#. 8pHCg
@@ -3505,38 +3523,110 @@ msgctxt ""
msgid "The Python interactive console, also known as Python interpreter or Python shell, provides programmers with a quick way to execute commands and try out and test code without creating a file. UNO objects introspection as well as %PRODUCTNAME Python modules documentation can be obtained from the terminal."
msgstr ""
-#. MZodx
+#. kFpxo
+#: python_shell.xhp
+msgctxt ""
+"python_shell.xhp\n"
+"par_id851633601202270\n"
+"help.text"
+msgid "From a full-featured %PRODUCTNAME installed package, use either Basic or Python:"
+msgstr ""
+
+#. 5HhXz
#: python_shell.xhp
msgctxt ""
"python_shell.xhp\n"
"N0121\n"
"help.text"
-msgid "Using a Basic macro:"
+msgid "Using a Basic macro"
msgstr ""
-#. vXGF7
+#. KhWLk
#: python_shell.xhp
msgctxt ""
"python_shell.xhp\n"
"N0127\n"
"help.text"
-msgid "Using a Python macro:"
+msgid "Using a Python macro"
msgstr ""
-#. oBg3T
+#. 3FCJH
#: python_shell.xhp
msgctxt ""
"python_shell.xhp\n"
"N0141\n"
"help.text"
-msgid "Usage:"
+msgid "Example output"
msgstr ""
-#. EzwwC
+#. MxDtE
#: python_shell.xhp
msgctxt ""
"python_shell.xhp\n"
"N0142\n"
"help.text"
-msgid "<image src=\"media/helpimg/python/python_shell.png\" id=\"N0143\"><alt id=\"N0144\">Python Interactive Console</alt></image>"
+msgid "<image src=\"media/helpimg/python/python_interactive_console.png\" id=\"N0143\"><alt id=\"N0143\">Python Interactive Console</alt></image>"
+msgstr ""
+
+#. fk6sx
+#: python_shell.xhp
+msgctxt ""
+"python_shell.xhp\n"
+"hd_id381633446811095\n"
+"help.text"
+msgid "Using the Terminal"
+msgstr ""
+
+#. CNFdD
+#: python_shell.xhp
+msgctxt ""
+"python_shell.xhp\n"
+"par_id801633601715910\n"
+"help.text"
+msgid "From a %PRODUCTNAME copy included in a GNU/Linux platform, use the terminal as shown:"
+msgstr ""
+
+#. vWPwe
+#: python_shell.xhp
+msgctxt ""
+"python_shell.xhp\n"
+"par_id531633444780190\n"
+"help.text"
+msgid "<literal>whereis</literal> or <literal>type</literal> terminal commands help locate Python interactive console:"
+msgstr ""
+
+#. 8Ei5d
+#: python_shell.xhp
+msgctxt ""
+"python_shell.xhp\n"
+"hd_id311633513620803\n"
+"help.text"
+msgid "Alternative console"
+msgstr ""
+
+#. d8DCA
+#: python_shell.xhp
+msgctxt ""
+"python_shell.xhp\n"
+"par_id81632760673283\n"
+"help.text"
+msgid "Use <link href=\"https://extensions.libreoffice.org/extensions/apso-alternative-script-organizer-for-Python\" name=\"APSO extension\">APSO extension</link> console as an alternative:"
+msgstr ""
+
+#. 6h9CS
+#: python_shell.xhp
+msgctxt ""
+"python_shell.xhp\n"
+"N0144\n"
+"help.text"
+msgid "<image src=\"media/helpimg/python/python_shell.png\" id=\"N0144\"><alt id=\"N0144\">APSO console</alt></image>"
+msgstr ""
+
+#. DNr5W
+#: python_shell.xhp
+msgctxt ""
+"python_shell.xhp\n"
+"par_id351633599611244\n"
+"help.text"
+msgid "<link href=\"text/sbasic/shared/03/sf_exception.html?#PythonShell\" name=\"PythonShell method\"><literal>PythonShell</literal></link> function in <link href=\"text/sbasic/shared/03/sf_exception.html\" name=\"ScriptForge.Exception service\"><literal>ScriptForge.Exception</literal></link> service"
msgstr ""
diff --git a/source/zh-TW/helpcontent2/source/text/sbasic/shared.po b/source/zh-TW/helpcontent2/source/text/sbasic/shared.po
index bea0eeb2730..e75b2cefbd4 100644
--- a/source/zh-TW/helpcontent2/source/text/sbasic/shared.po
+++ b/source/zh-TW/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-10-04 19:51+0200\n"
+"POT-Creation-Date: 2021-10-25 12:48+0200\n"
"PO-Revision-Date: 2018-10-21 20:41+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16622,13 +16622,13 @@ msgctxt ""
msgid "MsgBox Right(\"00\" & lHour , 2) & \":\"& Right(\"00\" & lMin , 2) & \":\" & Right(\"00\" & lSec , 2), 0, \"The time is\""
msgstr ""
-#. CWMJG
+#. oYudq
#: 03030303.xhp
msgctxt ""
"03030303.xhp\n"
"par_id491610993401822\n"
"help.text"
-msgid "The <literal>Timer</literal> function measures time in seconds. To measure time in milliseconds use the <embedvar href=\"text/sbasic/shared/03/sf_timer.xhp#TimerService\"/>."
+msgid "The <literal>Timer</literal> function measures time in seconds. To measure time in milliseconds use the <link href=\"text/sbasic/shared/03/sf_timer.xhp\" name=\"Timer_link\">Timer service</link> available in the <literal>ScriptForge</literal> library."
msgstr ""
#. ATnCy
@@ -24587,13 +24587,13 @@ msgctxt ""
msgid "<bookmark_value>Type statement</bookmark_value>"
msgstr ""
-#. aKHFj
+#. pipio
#: 03090413.xhp
msgctxt ""
"03090413.xhp\n"
"hd_id3153311\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03090413.xhp\" name=\"Type Statement\">Type Statement</link>"
+msgid "<variable id=\"Type_h1\"><link href=\"text/sbasic/shared/03090413.xhp\" name=\"Type Statement\">Type Statement</link></variable>"
msgstr ""
#. TYvyD
@@ -27800,13 +27800,13 @@ msgctxt ""
msgid "<bookmark_value>IsObject function</bookmark_value>"
msgstr "<bookmark_value>IsObject 函式</bookmark_value>"
-#. 9oZFD
+#. MF9nS
#: 03102800.xhp
msgctxt ""
"03102800.xhp\n"
-"hd_id3149346\n"
+"hd_id51633474369322\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03102800.xhp\" name=\"IsObject Function\">IsObject Function</link>"
+msgid "<variable id=\"IsObject_h1\"><link href=\"text/sbasic/shared/03102800.xhp\" name=\"IsObject Function\">IsObject Function</link></variable>"
msgstr ""
#. AyVCR
@@ -27818,67 +27818,13 @@ msgctxt ""
msgid "Tests if a variable is an object, as opposed to primitive data types such as dates, numbers, texts. The function returns <literal>True</literal> if the variable is an object, otherwise it returns <literal>False</literal>."
msgstr ""
-#. gBKMV
-#: 03102800.xhp
-msgctxt ""
-"03102800.xhp\n"
-"hd_id3149234\n"
-"help.text"
-msgid "Syntax:"
-msgstr "<emph>語法</emph>:"
-
-#. C8wfe
-#: 03102800.xhp
-msgctxt ""
-"03102800.xhp\n"
-"par_id3154285\n"
-"help.text"
-msgid "IsObject(var)"
-msgstr ""
-
-#. ni2zH
-#: 03102800.xhp
-msgctxt ""
-"03102800.xhp\n"
-"hd_id3148685\n"
-"help.text"
-msgid "Return value:"
-msgstr "<emph>傳回值類型</emph>:"
-
-#. 4SsCT
-#: 03102800.xhp
-msgctxt ""
-"03102800.xhp\n"
-"par_id3156024\n"
-"help.text"
-msgid "Boolean"
-msgstr ""
-
-#. rEmQA
-#: 03102800.xhp
-msgctxt ""
-"03102800.xhp\n"
-"hd_id3148947\n"
-"help.text"
-msgid "Parameters:"
-msgstr "參數:"
-
-#. JBB4B
-#: 03102800.xhp
-msgctxt ""
-"03102800.xhp\n"
-"par_id3148552\n"
-"help.text"
-msgid "<emph>var:</emph> Any variable that you want to test."
-msgstr ""
-
-#. SPGXx
+#. jCmJE
#: 03102800.xhp
msgctxt ""
"03102800.xhp\n"
"par_id891575896963115\n"
"help.text"
-msgid "The following objects return <literal>True</literal>:"
+msgid "This function returns <literal>True</literal> for the following object types:"
msgstr ""
#. CBoWs
@@ -27935,6 +27881,24 @@ msgctxt ""
msgid "Data structures return <literal>True</literal> even when empty. Object defined variables return <literal>True</literal> even if uninitialized."
msgstr ""
+#. 4SsCT
+#: 03102800.xhp
+msgctxt ""
+"03102800.xhp\n"
+"par_id3156024\n"
+"help.text"
+msgid "Boolean"
+msgstr ""
+
+#. rTuwL
+#: 03102800.xhp
+msgctxt ""
+"03102800.xhp\n"
+"par_id3148552\n"
+"help.text"
+msgid "<emph>var:</emph> The variable to be tested."
+msgstr ""
+
#. yHDkt
#: 03102800.xhp
msgctxt ""
@@ -28889,14 +28853,14 @@ msgctxt ""
msgid "Set Statement"
msgstr ""
-#. GzHJQ
+#. zHGh5
#: 03103700.xhp
msgctxt ""
"03103700.xhp\n"
"bm_id3154422\n"
"help.text"
-msgid "<bookmark_value>Set statement</bookmark_value> <bookmark_value>New keyword</bookmark_value> <bookmark_value>Nothing object</bookmark_value>"
-msgstr ""
+msgid "<bookmark_value>Set statement</bookmark_value> <bookmark_value>Nothing object</bookmark_value>"
+msgstr "<bookmark_value>Set 陳述式</bookmark_value><bookmark_value>Nothing 物件</bookmark_value>"
#. MT9CF
#: 03103700.xhp
@@ -29762,23 +29726,32 @@ msgctxt ""
msgid "<bookmark_value>EqualUnoObjects function</bookmark_value>"
msgstr "<bookmark_value>EqualUnoObjects 函式</bookmark_value>"
-#. rqXey
+#. DxBM3
#: 03104600.xhp
msgctxt ""
"03104600.xhp\n"
-"hd_id3149205\n"
+"hd_id791633472607429\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03104600.xhp\" name=\"EqualUnoObjects Function\">EqualUnoObjects Function</link>"
+msgid "<variable id=\"EqualUnoObjects_h1\"><link href=\"text/sbasic/shared/03104600.xhp\" name=\"EqualUnoObjects Function\">EqualUnoObjects Function</link></variable>"
msgstr ""
-#. wrfhm
+#. Gc4cj
#: 03104600.xhp
msgctxt ""
"03104600.xhp\n"
"par_id3145090\n"
"help.text"
-msgid "Returns True if the two specified Basic Uno objects represent the same Uno object instance."
-msgstr "如果指定的兩個 Basic Uno 物件表示相同的 Uno 物件實例,則傳回 True (真)。"
+msgid "Returns <emph>True</emph> if the two specified Basic variables represent the same Uno object instance."
+msgstr ""
+
+#. 9Zx4W
+#: 03104600.xhp
+msgctxt ""
+"03104600.xhp\n"
+"par_id61633530293311\n"
+"help.text"
+msgid "<emph>oObj1, oObj2:</emph> the variables to be tested."
+msgstr ""
#. NqNdq
#: 03104600.xhp
@@ -29789,22 +29762,22 @@ msgctxt ""
msgid "Bool"
msgstr "布林型"
-#. eQEDj
+#. NvGLb
#: 03104600.xhp
msgctxt ""
"03104600.xhp\n"
-"par_id3156024\n"
+"par_id771633473462939\n"
"help.text"
-msgid "' Copy of objects -> same instance"
+msgid "The example below returns <emph>True</emph> because both <literal>oDoc</literal> and <literal>ThisComponent</literal> are references to the same object:"
msgstr ""
-#. kTNQT
+#. 5QGLx
#: 03104600.xhp
msgctxt ""
"03104600.xhp\n"
-"par_id3153525\n"
+"par_id181633473874216\n"
"help.text"
-msgid "' Copy of structs as value -> new instance"
+msgid "The example below returns <emph>False</emph> because the assignment creates a copy of the original object. Hence <literal>Struct1</literal> and <literal>Struct2</literal> refer to different object instances."
msgstr ""
#. hQzux
@@ -30365,13 +30338,13 @@ msgctxt ""
msgid "Use the <emph>Chr$</emph> function to send special control sequences to a printer or to another output source. You can also use it to insert quotation marks in a string expression."
msgstr "使用 <emph>Chr$</emph> 函式,將特殊控制項序列傳送至印表機或其他匯出源。您也可以使用該函式,以在字串型表示式中插入引號。"
-#. Yy5Eh
+#. 36Hj5
#: 03120102.xhp
msgctxt ""
"03120102.xhp\n"
-"par_id111552916434071\n"
+"par_id81634652871848\n"
"help.text"
-msgid "<embedvar href=\"text/sbasic/shared/00000003.xhp#err6\"/>, when VBA compatibility mode is enabled and expression is greater than 255."
+msgid "An overflow error will occur when VBA compatibility mode is enabled and the expression value is greater than 255."
msgstr ""
#. vHwsG
@@ -32651,14 +32624,14 @@ msgctxt ""
msgid "Split (Text As String, delimiter, number)"
msgstr "Split (Text As String, delimiter, number)"
-#. BNdCD
+#. dBAZR
#: 03120314.xhp
msgctxt ""
"03120314.xhp\n"
"par_id3154285\n"
"help.text"
-msgid "String"
-msgstr "字串型"
+msgid "With Option VBASupport 1: String, with Option VBASupport 0: Variant/String"
+msgstr ""
#. PRupM
#: 03120314.xhp
@@ -35405,13 +35378,13 @@ msgctxt ""
msgid "<bookmark_value>CreateObject function</bookmark_value>"
msgstr "<bookmark_value>CreateObject 函式</bookmark_value>"
-#. GkTQC
+#. QpKCT
#: 03132400.xhp
msgctxt ""
"03132400.xhp\n"
"par_idN10580\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03132400.xhp\">CreateObject Function</link>"
+msgid "<variable id=\"CreateObject_h1\"><link href=\"text/sbasic/shared/03132400.xhp\">CreateObject Function</link></variable>"
msgstr ""
#. PAXDf
@@ -35432,14 +35405,14 @@ msgctxt ""
msgid "This method creates instances of the type that is passed as parameter."
msgstr "這個方法會建立傳送為參數的實例類型。"
-#. mNxwL
+#. SHgqs
#: 03132400.xhp
msgctxt ""
"03132400.xhp\n"
-"par_idN105A6\n"
+"par_id191633632167310\n"
"help.text"
-msgid "oObj = CreateObject( type )"
-msgstr "oObj = CreateObject( type )"
+msgid "<emph>type:</emph> the type of the object to be created, as a string."
+msgstr ""
#. Gthw7
#: 03132500.xhp
@@ -37466,49 +37439,94 @@ msgctxt ""
msgid "Round Function [VBA]"
msgstr ""
-#. 66dvh
+#. zEB5S
#: 03170000.xhp
msgctxt ""
"03170000.xhp\n"
"bm_id3150499\n"
"help.text"
-msgid "<bookmark_value>Round function</bookmark_value>"
+msgid "<bookmark_value>Round function (VBA)</bookmark_value>"
msgstr ""
-#. FPUAv
+#. oVQUL
#: 03170000.xhp
msgctxt ""
"03170000.xhp\n"
"hd_id3150499\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03170000.xhp\" name=\"Round Function [VBA]\">Round Function [VBA]</link>"
+msgid "<variable id=\"Round_VBA_h1\"><link href=\"text/sbasic/shared/03170000.xhp\" name=\"Round Function [VBA]\">Round Function [VBA]</link></variable>"
msgstr ""
-#. PGShA
+#. B6tFP
#: 03170000.xhp
msgctxt ""
"03170000.xhp\n"
"par_id3151384\n"
"help.text"
-msgid "The Round function returns a number rounded to a specified number of digits."
+msgid "Rounds a numeric value to a specified number of decimal digits."
msgstr ""
-#. hbUFX
+#. yUTFN
+#: 03170000.xhp
+msgctxt ""
+"03170000.xhp\n"
+"par_id741634154499890\n"
+"help.text"
+msgid "This function implements the rounding rule known as \"round-to-even\". With this rule, whenever the difference between the number to be rounded and its nearest integer is equal to 0.5, the number is rounded to the nearest even number. See the examples <link href=\"text/sbasic/shared/03170000.xhp#round_example\" name=\"round_ex_link\">below</link> to learn more about this rule."
+msgstr ""
+
+#. DfnHz
+#: 03170000.xhp
+msgctxt ""
+"03170000.xhp\n"
+"par_id691634217736290\n"
+"help.text"
+msgid "Beware that VBA's <literal>Round</literal> function works differently than %PRODUCTNAME Calc's <literal>Round</literal> function. In Calc, if the difference between the number to be rounded and the nearest integer is exactly 0.5, then the number is rounded up. Hence, in Calc the number 2.5 is rounded to 3 whereas using VBA's <literal>Round</literal> function the value 2.5 is rounded to 2 due to the \"round-to-even\" rule."
+msgstr ""
+
+#. GSzGj
#: 03170000.xhp
msgctxt ""
"03170000.xhp\n"
"par_id240720170117391741\n"
"help.text"
-msgid "<emph>expression</emph>: Required. The numeric expression to be rounded."
+msgid "<emph>expression</emph>: The numeric expression to be rounded."
msgstr ""
-#. gAZc7
+#. 9E33v
#: 03170000.xhp
msgctxt ""
"03170000.xhp\n"
"par_id240720170117395610\n"
"help.text"
-msgid "<emph>numdecimalplaces</emph>: Optional. Specifies how many places to the right of the decimal are included in the rounding. Default is 0."
+msgid "<emph>numdecimalplaces</emph>: Optional argument that specifies the number of decimal digits in the resulting rounded value. The default value is 0."
+msgstr ""
+
+#. oSEiU
+#: 03170000.xhp
+msgctxt ""
+"03170000.xhp\n"
+"par_id541634154843718\n"
+"help.text"
+msgid "The following examples illustrate the \"round-to-even\" rule:"
+msgstr ""
+
+#. 4DLZC
+#: 03170000.xhp
+msgctxt ""
+"03170000.xhp\n"
+"bas_id651634154984931\n"
+"help.text"
+msgid "' Rounding to the nearest integer (decimalplaces = 0)"
+msgstr ""
+
+#. DQwkT
+#: 03170000.xhp
+msgctxt ""
+"03170000.xhp\n"
+"bas_id651634157812537\n"
+"help.text"
+msgid "' Rounding with 2 decimal digits (decimalplaces = 2)"
msgstr ""
#. g7CVV
@@ -40166,6 +40184,375 @@ msgctxt ""
msgid "BasicCodeStubs"
msgstr ""
+#. vSapF
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"tit\n"
+"help.text"
+msgid "Collection Object"
+msgstr ""
+
+#. 5of5h
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"bm_id3149205\n"
+"help.text"
+msgid "<bookmark_value>Collection Object</bookmark_value> <bookmark_value>Collection;Count</bookmark_value>"
+msgstr ""
+
+#. 68sg6
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"hd_id791633472607429\n"
+"help.text"
+msgid "<variable id=\"Collection_h1\"><link href=\"text/sbasic/shared/collection.xhp\" name=\"New_Operator\">Collection Object</link></variable>"
+msgstr ""
+
+#. 7xSei
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id581633961735332\n"
+"help.text"
+msgid "Collections can be used to store items of different types. Each item can be accessed by its index or by an optional key associated with it."
+msgstr ""
+
+#. 9b4kg
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id131633961959816\n"
+"help.text"
+msgid "A <literal>Collection</literal> object has the following methods:"
+msgstr ""
+
+#. XoLQr
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id331633962000259\n"
+"help.text"
+msgid "<emph>Add:</emph> inserts a new item into the collection. Optionally a string value can be defined as the key to the item."
+msgstr ""
+
+#. ddAGy
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id181633962000767\n"
+"help.text"
+msgid "<emph>Count:</emph> returns the number of items in the collection."
+msgstr ""
+
+#. ad7qY
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id521633962001072\n"
+"help.text"
+msgid "<emph>Item:</emph> returns the item in the collection by passing its index or key."
+msgstr ""
+
+#. GX6nx
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id981633962001272\n"
+"help.text"
+msgid "<emph>Remove:</emph> removes the specified item from the collection by its index or key."
+msgstr ""
+
+#. yyWx7
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id221633976539661\n"
+"help.text"
+msgid "Items in a Collection can be accessed either by their indices (as in a 1-based single-dimensional Array) or by their associated keys."
+msgstr ""
+
+#. PheLX
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id811634214809970\n"
+"help.text"
+msgid "The <link href=\"text/sbasic/shared/03/sf_dictionary.xhp\" name=\"SFDic_link\"><literal>ScriptForge Dictionary</literal></link> service extends the <literal>Collection</literal> object by providing supplemental features as key retrieval and replacement, as well as import/export to Array objects and JSON strings."
+msgstr ""
+
+#. pJAht
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"hd_id51633962353863\n"
+"help.text"
+msgid "Creating a Collection"
+msgstr ""
+
+#. 28i8B
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id491633962366024\n"
+"help.text"
+msgid "To create a <literal>Collection</literal> use the <literal>New</literal> keyword. The following example creates a <literal>Collection</literal> object and populates it with three items:"
+msgstr ""
+
+#. 8hHmz
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"hd_id421633962742512\n"
+"help.text"
+msgid "Adding Items"
+msgstr ""
+
+#. G49p7
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"bm_id591633974561425\n"
+"help.text"
+msgid "<bookmark_value>Collection;Add</bookmark_value>"
+msgstr ""
+
+#. 3qnWY
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id261633962766238\n"
+"help.text"
+msgid "The <literal>Add</literal> method can be used to add new items into the <literal>Collection</literal> object."
+msgstr ""
+
+#. htAaY
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id501633974650241\n"
+"help.text"
+msgid "<emph>item:</emph> the item to be added to the <literal>Collection</literal>. May be of any type."
+msgstr ""
+
+#. DUGrx
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id181633974650705\n"
+"help.text"
+msgid "<emph>key:</emph> string value used as the unique key used to identify this value."
+msgstr ""
+
+#. yoEzK
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id391633974651050\n"
+"help.text"
+msgid "<emph>before, after:</emph> optional keyword argument that indicates where the new item will be placed in the <literal>Collection</literal>. Only one of the arguments <literal>before</literal> or <literal>after</literal> can be specified to determine the index or key before which (or after which) the new item is to be placed."
+msgstr ""
+
+#. xcdEF
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id211633962988398\n"
+"help.text"
+msgid "The example below adds two elements into a <literal>Collection</literal>. The first has a key associated with it, whereas the second does not."
+msgstr ""
+
+#. ZKBEQ
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id71633963110632\n"
+"help.text"
+msgid "The <literal>Add</literal> method also supports keyword arguments:"
+msgstr ""
+
+#. ZhTZb
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id941633963225913\n"
+"help.text"
+msgid "Keys must be unique in a <literal>Collection</literal> object. Comparison between keys is <emph>case-insensitive</emph>. Adding duplicated keys will result in a runtime error."
+msgstr ""
+
+#. NVgmj
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id891633975568372\n"
+"help.text"
+msgid "The example below illustrates how to use the <literal>Before</literal> and <literal>After</literal> keyword arguments to determine the position of the item that is being added."
+msgstr ""
+
+#. WxjE9
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id121633976325472\n"
+"help.text"
+msgid "Items in a <literal>Collection</literal> object are assigned an integer index value that starts at 1 and corresponds to the order in which they were added."
+msgstr ""
+
+#. 2Lrc6
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"hd_id141633977141797\n"
+"help.text"
+msgid "Accessing Items"
+msgstr ""
+
+#. DDdKC
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"bm_id481633977601834\n"
+"help.text"
+msgid "<bookmark_value>Collection;Item</bookmark_value>"
+msgstr ""
+
+#. MquEn
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id431633977156315\n"
+"help.text"
+msgid "Use the <literal>Item</literal> method to access a given item by its index or key."
+msgstr ""
+
+#. DCFTg
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id261633976447187\n"
+"help.text"
+msgid "<emph>index:</emph> an integer value specifying the index of the item to be returned."
+msgstr ""
+
+#. mqA85
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id51633976782487\n"
+"help.text"
+msgid "<emph>key:</emph> a string value specifying the key of the item to be returned."
+msgstr ""
+
+#. egnJW
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"hd_id651633976030220\n"
+"help.text"
+msgid "Removing Items"
+msgstr ""
+
+#. BdBa3
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"bm_id311633977567197\n"
+"help.text"
+msgid "<bookmark_value>Collection;Remove</bookmark_value>"
+msgstr ""
+
+#. Wteju
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id391633976125206\n"
+"help.text"
+msgid "Use the <literal>Remove</literal> method to delete items from a <literal>Collection</literal> object."
+msgstr ""
+
+#. sHVAN
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id121633976268027\n"
+"help.text"
+msgid "Items can be removed either by their indices or key values."
+msgstr ""
+
+#. o9Eyd
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id261633976447289\n"
+"help.text"
+msgid "<emph>index:</emph> an integer value specifying the index of the item to be removed."
+msgstr ""
+
+#. 8TMiC
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id51633976782455\n"
+"help.text"
+msgid "<emph>key:</emph> a string value specifying the key of the item to be removed."
+msgstr ""
+
+#. WpHmn
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"hd_id491633978085731\n"
+"help.text"
+msgid "Iterating Over all Items"
+msgstr ""
+
+#. FVzmC
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id91633978099143\n"
+"help.text"
+msgid "It is possible to use a <literal>For Each ... Next</literal> statement to iterate over all items in a <literal>Collection</literal>."
+msgstr ""
+
+#. EWDWE
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"hd_id191634215349347\n"
+"help.text"
+msgid "Clearing a Collection"
+msgstr ""
+
+#. V4EZw
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"par_id891634215363485\n"
+"help.text"
+msgid "To remove all items from a <literal>Collection</literal> object call the <literal>Remove</literal> method for each item, as illustrated in the example below:"
+msgstr ""
+
+#. tUMtQ
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"bas_id681634215646028\n"
+"help.text"
+msgid "' Create a sample Collection with two entries"
+msgstr ""
+
+#. Yy5nP
+#: collection.xhp
+msgctxt ""
+"collection.xhp\n"
+"bas_id391634215647196\n"
+"help.text"
+msgid "' Removes all items in the collection"
+msgstr ""
+
#. gvH3T
#: compatibilitymode.xhp
msgctxt ""
@@ -40346,13 +40733,13 @@ msgctxt ""
msgid "<variable id=\"compatiblestatement\"><link href=\"text/sbasic/shared/compatible.xhp\" name=\"compatible\">Option Compatible Statement</link></variable>"
msgstr ""
-#. qCdkp
+#. 6HFov
#: compatible.xhp
msgctxt ""
"compatible.xhp\n"
"N0106\n"
"help.text"
-msgid "<literal>Option Compatible</literal> turns on the VBA-compatible Basic compiler mode at the module level."
+msgid "<literal>Option Compatible</literal> extends %PRODUCTNAME Basic compiler and runtime, allowing supplemental language constructs to Basic."
msgstr ""
#. SNhhH
@@ -41039,6 +41426,78 @@ msgctxt ""
msgid "<image src=\"media/helpimg/sbasic/char_fragment.svg\" id=\"img_id4157296484514\"><alt id=\"alt_id15152796484516\">type declaration characters</alt></image>"
msgstr ""
+#. tYUK6
+#: is_keyword.xhp
+msgctxt ""
+"is_keyword.xhp\n"
+"tit\n"
+"help.text"
+msgid "Is Operator"
+msgstr ""
+
+#. xvBgn
+#: is_keyword.xhp
+msgctxt ""
+"is_keyword.xhp\n"
+"bm_id3149205\n"
+"help.text"
+msgid "<bookmark_value>Is Operator</bookmark_value>"
+msgstr ""
+
+#. 7otAB
+#: is_keyword.xhp
+msgctxt ""
+"is_keyword.xhp\n"
+"hd_id791633472607429\n"
+"help.text"
+msgid "<variable id=\"IsOperator_h1\"><link href=\"text/sbasic/shared/is_keyword.xhp\" name=\"Is_Operator\">Is Operator</link></variable>"
+msgstr ""
+
+#. mwGMA
+#: is_keyword.xhp
+msgctxt ""
+"is_keyword.xhp\n"
+"par_id3145090\n"
+"help.text"
+msgid "Tests if two Basic variables refer to the same object instance."
+msgstr ""
+
+#. HTVQA
+#: is_keyword.xhp
+msgctxt ""
+"is_keyword.xhp\n"
+"par_id441633531311929\n"
+"help.text"
+msgid "If <literal>oObj1</literal> and <literal>oObj2</literal> are references to the same object instance, the result will be <emph>True</emph>."
+msgstr ""
+
+#. akugg
+#: is_keyword.xhp
+msgctxt ""
+"is_keyword.xhp\n"
+"par_id771633473462939\n"
+"help.text"
+msgid "The example below first defines a new type <literal>Student</literal>. Calling <literal>TestObjects</literal> creates the object <literal>oStudent1</literal> as a new object of this type."
+msgstr ""
+
+#. mAAho
+#: is_keyword.xhp
+msgctxt ""
+"is_keyword.xhp\n"
+"par_id841633532400710\n"
+"help.text"
+msgid "The assignment <literal>oStudent2 = oStudent1</literal> actually copies the reference to the same object. Hence the result of applying the <literal>Is</literal> operator is <emph>True</emph>."
+msgstr ""
+
+#. mvVuR
+#: is_keyword.xhp
+msgctxt ""
+"is_keyword.xhp\n"
+"par_id181633473874216\n"
+"help.text"
+msgid "The example below returns <emph>False</emph> because <literal>oStudent1</literal> and <literal>oStudent2</literal> are references to two different object instances, each created with the <literal>New</literal> operator."
+msgstr ""
+
#. onSEk
#: keys.xhp
msgctxt ""
@@ -41345,6 +41804,87 @@ msgctxt ""
msgid "%PRODUCTNAME installs a set of Basic macro libraries that can be accessed from your Basic macros."
msgstr ""
+#. 44MBv
+#: new_keyword.xhp
+msgctxt ""
+"new_keyword.xhp\n"
+"tit\n"
+"help.text"
+msgid "New Operator"
+msgstr ""
+
+#. 8iBmc
+#: new_keyword.xhp
+msgctxt ""
+"new_keyword.xhp\n"
+"bm_id3149205\n"
+"help.text"
+msgid "<bookmark_value>New Operator</bookmark_value>"
+msgstr ""
+
+#. T3AA8
+#: new_keyword.xhp
+msgctxt ""
+"new_keyword.xhp\n"
+"hd_id791633472607429\n"
+"help.text"
+msgid "<variable id=\"NewOperator_h1\"><link href=\"text/sbasic/shared/new_keyword.xhp\" name=\"New_Operator\">New Operator</link></variable>"
+msgstr ""
+
+#. BWufp
+#: new_keyword.xhp
+msgctxt ""
+"new_keyword.xhp\n"
+"par_id3145090\n"
+"help.text"
+msgid "Use the <literal>New</literal> operator to instantiate objects of user-defined types, as well as Uno services, structs and enumerations."
+msgstr ""
+
+#. uDGEZ
+#: new_keyword.xhp
+msgctxt ""
+"new_keyword.xhp\n"
+"par_id831633630704012\n"
+"help.text"
+msgid "The <literal>New</literal> operator can be used either during variable declaration or in an assignment operation."
+msgstr ""
+
+#. r6osC
+#: new_keyword.xhp
+msgctxt ""
+"new_keyword.xhp\n"
+"par_id621633630563936\n"
+"help.text"
+msgid "The following example uses the <literal>New</literal> operator to create an instance of the <literal>PropertyValue</literal> Uno struct."
+msgstr ""
+
+#. nPNvc
+#: new_keyword.xhp
+msgctxt ""
+"new_keyword.xhp\n"
+"bas_id631633630856218\n"
+"help.text"
+msgid "' Instantiating the object during variable declaration"
+msgstr ""
+
+#. Ts8iC
+#: new_keyword.xhp
+msgctxt ""
+"new_keyword.xhp\n"
+"bas_id11633631135918\n"
+"help.text"
+msgid "' The same can be accomplished with an assignment"
+msgstr ""
+
+#. 6RJcJ
+#: new_keyword.xhp
+msgctxt ""
+"new_keyword.xhp\n"
+"par_id971633631328827\n"
+"help.text"
+msgid "The example below creates a new type <literal>Student</literal> and instantiates an object of this type:"
+msgstr ""
+
#. r4nQn
#: partition.xhp
msgctxt ""
diff --git a/source/zh-TW/helpcontent2/source/text/sbasic/shared/03.po b/source/zh-TW/helpcontent2/source/text/sbasic/shared/03.po
index ef68f83188e..d4168c3790e 100644
--- a/source/zh-TW/helpcontent2/source/text/sbasic/shared/03.po
+++ b/source/zh-TW/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-10-04 19:51+0200\n"
+"POT-Creation-Date: 2021-10-25 12:48+0200\n"
"PO-Revision-Date: 2018-07-12 14:38+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -160,13 +160,13 @@ msgctxt ""
msgid "<variable id=\"ScriptForge_lib\"><link href=\"text/sbasic/shared/03/lib_ScriptForge.xhp\" name=\"ScriptForge library\">The <literal>ScriptForge</literal> Library</link></variable>"
msgstr ""
-#. yE8bw
+#. Poeai
#: lib_ScriptForge.xhp
msgctxt ""
"lib_ScriptForge.xhp\n"
"bm_id491529070339774\n"
"help.text"
-msgid "<bookmark_value>BASIC ScriptForge library</bookmark_value> <bookmark_value>Python scriptforge module</bookmark_value>"
+msgid "<bookmark_value>BASIC ScriptForge library</bookmark_value> <bookmark_value>Python scriptforge module</bookmark_value>"
msgstr ""
#. BtMUU
@@ -178,13 +178,13 @@ msgctxt ""
msgid "ScriptForge libraries build up an extensible collection of macro scripting resources for %PRODUCTNAME to be invoked from Basic macros or Python scripts."
msgstr ""
-#. YwSXj
+#. eotwE
#: lib_ScriptForge.xhp
msgctxt ""
"lib_ScriptForge.xhp\n"
"par_id1001623412767893\n"
"help.text"
-msgid "To learn more about how to create and execute Python scripts using the <literal>ScriptForge</literal> library, read the <embedvar href=\"text/sbasic/shared/03/sf_intro.xhp#title\"/> help page."
+msgid "To learn more about how to create and execute Python scripts using the <literal>ScriptForge</literal> library, read the help page <link href=\"text/sbasic/shared/03/sf_intro.xhp\" name=\"sfintro_link\">Creating Python Scripts with ScriptForge</link>."
msgstr ""
#. wKZM6
@@ -9106,13 +9106,13 @@ msgctxt ""
msgid "Keys and items can be retrieved, counted, updated, and much more."
msgstr ""
-#. HnBYG
+#. LtaTT
#: sf_dictionary.xhp
msgctxt ""
"sf_dictionary.xhp\n"
"par_id971582884636922\n"
"help.text"
-msgid "%PRODUCTNAME Basic <literal>Collection</literal> object does not support the retrieval of the keys. <br/>Additionally its items contain only primitive Basic data types such as dates, text, numbers, and the like."
+msgid "The Dictionary service is similar to the built-in %PRODUCTNAME Basic <literal>Collection</literal> object, however with more features. For example, <literal>Collection</literal> objects do not support the retrieval of keys. Moreover, Dictionaries provide additional capabilities as replacing keys, testing if a specific key already exists and converting the Dictionary into an Array object or JSON string."
msgstr ""
#. RkMHR
@@ -15775,13 +15775,13 @@ msgctxt ""
msgid "<emph>Debugging:</emph> Whenever an error occurs in Python scripts that use <literal>ScriptForge</literal>, the error message provided by the Python execution stack displays the line of code that triggered the error. In Basic error messages do not display this information."
msgstr ""
-#. ZzngK
+#. cPtYB
#: sf_intro.xhp
msgctxt ""
"sf_intro.xhp\n"
"par_id31623411828158\n"
"help.text"
-msgid "Visit <embedvar href=\"text/sbasic/python/main0000.xhp#pythonscriptshelp\"/> for more information on Python scripting using %PRODUCTNAME."
+msgid "Visit <link href=\"text/sbasic/python/main0000.xhp#\" name=\"pyscripts_link\">%PRODUCTNAME Python Scripts Help</link> for more information on Python scripting using %PRODUCTNAME."
msgstr ""
#. CZiTF
@@ -17620,13 +17620,13 @@ msgctxt ""
msgid "ScriptForge.Session service"
msgstr ""
-#. c4YAM
+#. DxnDG
#: sf_session.xhp
msgctxt ""
"sf_session.xhp\n"
"hd_id901582814720985\n"
"help.text"
-msgid "<variable id=\"SessionService\"><link href=\"text/sbasic/shared/03/sf_session.xhp\" name=\"Session service\"><literal>ScriptForge</literal>.<literal>Session</literal> service</link></variable>"
+msgid "<variable id=\"SessionService\"><link href=\"text/sbasic/shared/03/sf_session.xhp\" name=\"Session service\"><literal>ScriptForge.Session</literal> service</link></variable>"
msgstr ""
#. yTgFK
@@ -18025,13 +18025,13 @@ msgctxt ""
msgid "Consider the Python function <literal>odd_integers</literal> defined below that creates a list with odd integer values between <literal>v1</literal> and <literal>v2</literal>. Suppose this function is stored in a file named <emph>my_macros.py</emph> in your user scripts folder."
msgstr ""
-#. CHr5n
+#. o6DUm
#: sf_session.xhp
msgctxt ""
"sf_session.xhp\n"
"par_id751626817335715\n"
"help.text"
-msgid "Read the help page <embedvar href=\"text/sbasic/python/python_locations.xhp#pythonlocations1\"/> to learn more about where Python scripts can be stored."
+msgid "Read the help page <link href=\"text/sbasic/python/python_locations.xhp\" name=\"pylocation_link\">Python Scripts Organization and Location</link> to learn more about where Python scripts can be stored."
msgstr ""
#. vqBm9
diff --git a/source/zh-TW/helpcontent2/source/text/scalc.po b/source/zh-TW/helpcontent2/source/text/scalc.po
index 122cc5a9aec..56ed6fc3a0f 100644
--- a/source/zh-TW/helpcontent2/source/text/scalc.po
+++ b/source/zh-TW/helpcontent2/source/text/scalc.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-10-04 19:51+0200\n"
+"POT-Creation-Date: 2021-10-25 12:48+0200\n"
"PO-Revision-Date: 2018-02-05 09:04+0000\n"
"Last-Translator: Igli Manaj <manajigli@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -745,14 +745,14 @@ msgctxt ""
msgid "<variable id=\"main0200\"><link href=\"text/scalc/main0200.xhp\" name=\"Toolbars\">Toolbars</link></variable>"
msgstr "<variable id=\"main0200\"><link href=\"text/scalc/main0200.xhp\" name=\"圖示列\">圖示列</link></variable>"
-#. tdJRk
+#. yvzAm
#: main0200.xhp
msgctxt ""
"main0200.xhp\n"
"par_id3148798\n"
"help.text"
-msgid "This submenu lists the toolbars that are available in spreadsheets.<embedvar href=\"text/shared/00/00000007.xhp#symbolleistenneu\"/>"
-msgstr "此子功能表列出了可以在試算表文件中使用的工具列。<embedvar href=\"text/shared/00/00000007.xhp#symbolleistenneu\"/>"
+msgid "This submenu lists the toolbars that are available in spreadsheets. This overview describes the default toolbar configuration for %PRODUCTNAME."
+msgstr ""
#. XUCUB
#: main0202.xhp
diff --git a/source/zh-TW/helpcontent2/source/text/scalc/01.po b/source/zh-TW/helpcontent2/source/text/scalc/01.po
index d4c560a4835..96420ab2b50 100644
--- a/source/zh-TW/helpcontent2/source/text/scalc/01.po
+++ b/source/zh-TW/helpcontent2/source/text/scalc/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-10-04 19:51+0200\n"
+"POT-Creation-Date: 2021-10-25 12:48+0200\n"
"PO-Revision-Date: 2020-12-31 12:36+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: Chinese (Traditional) <https://translations.documentfoundation.org/projects/libo_help-master/textscalc01/zh_Hant/>\n"
@@ -15667,13 +15667,13 @@ msgctxt ""
msgid "Array Functions"
msgstr "陣列函式"
-#. U7gUU
+#. BB9Ze
#: 04060107.xhp
msgctxt ""
"04060107.xhp\n"
"bm_id3147273\n"
"help.text"
-msgid "<bookmark_value>matrices; functions</bookmark_value><bookmark_value>Function Wizard; arrays</bookmark_value><bookmark_value>array formulas</bookmark_value><bookmark_value>inline array constants</bookmark_value><bookmark_value>formulas; arrays</bookmark_value><bookmark_value>functions; array functions</bookmark_value><bookmark_value>editing; array formulas</bookmark_value><bookmark_value>copying; array formulas</bookmark_value><bookmark_value>adjusting array ranges</bookmark_value><bookmark_value>calculating; conditional calculations</bookmark_value><bookmark_value>matrices; calculations</bookmark_value><bookmark_value>conditional calculations with arrays</bookmark_value><bookmark_value>implicit array handling</bookmark_value><bookmark_value>forced array handling</bookmark_value>"
+msgid "<bookmark_value>matrices; functions</bookmark_value><bookmark_value>Function Wizard; arrays</bookmark_value><bookmark_value>array formulas</bookmark_value><bookmark_value>inline array constants</bookmark_value><bookmark_value>formulas; arrays</bookmark_value><bookmark_value>functions; array functions</bookmark_value><bookmark_value>editing; array formulas</bookmark_value><bookmark_value>copying; array formulas</bookmark_value><bookmark_value>deleting; array formulas</bookmark_value><bookmark_value>adjusting array ranges</bookmark_value><bookmark_value>calculating; conditional calculations</bookmark_value><bookmark_value>matrices; calculations</bookmark_value><bookmark_value>conditional calculations with arrays</bookmark_value><bookmark_value>implicit array handling</bookmark_value><bookmark_value>forced array handling</bookmark_value>"
msgstr ""
#. ALUph
@@ -15856,14 +15856,14 @@ msgctxt ""
msgid "Array formulas appear in braces in $[officename] Calc. You cannot create array formulas by manually entering the braces."
msgstr "在 $[officename] Calc 中,陣列公式前後會加上大括號。但是,您不能透過手動輸入大括號來建立陣列公式。"
-#. 6GZXu
+#. 6zGAy
#: 04060107.xhp
msgctxt ""
"04060107.xhp\n"
"par_id3154342\n"
"help.text"
-msgid "The cells in a results array are automatically protected against changes. However, you can edit or copy the array formula by selecting the entire array cell range."
-msgstr "結果陣列中的儲存格自動受保護,無法變更。但是,您可以透過選取整個陣列儲存格範圍來編輯或複製陣列公式。"
+msgid "The cells in a results array are automatically protected against changes. However, you can edit, delete or copy the array formula by selecting the entire array cell range."
+msgstr ""
#. 2tDZj
#: 04060107.xhp
@@ -16009,13 +16009,13 @@ msgctxt ""
msgid "Editing Array Formulas"
msgstr "編輯陣列公式"
-#. cT3G3
+#. Qi4kV
#: 04060107.xhp
msgctxt ""
"04060107.xhp\n"
"par_id3149241\n"
"help.text"
-msgid "Select the cell range or array containing the array formula. To select the whole array, position the cell cursor inside the array range, then press <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline><emph> + /</emph>, where <emph>/</emph> is the <emph>Division</emph> key on the numeric keypad."
+msgid "Select the cell range or array containing the array formula. To select the whole array, position the cell cursor inside the array range, then press <switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> + <keycode>/</keycode>, where <keycode>/</keycode> is the division key on the numeric keypad."
msgstr ""
#. BzLzG
@@ -16045,6 +16045,33 @@ msgctxt ""
msgid "You can format the separate parts of an array. For example, you can change the font color. Select a cell range and then change the attribute you want."
msgstr "您可以分別格式化陣列的各個部分。例如,您可以變更字型顏色。選取儲存格範圍,然後變更需要的屬性。"
+#. Tes4E
+#: 04060107.xhp
+msgctxt ""
+"04060107.xhp\n"
+"hd_id541633516074226\n"
+"help.text"
+msgid "Deleting Array Formulae"
+msgstr ""
+
+#. adAax
+#: 04060107.xhp
+msgctxt ""
+"04060107.xhp\n"
+"par_id681633516103267\n"
+"help.text"
+msgid "Select the cell range or array containing the array formula. To select the whole array, position the cell cursor inside the array range, then press <switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> + <keycode>/</keycode>, where <keycode>/</keycode> is the division key on the numeric keypad."
+msgstr ""
+
+#. 5xB8E
+#: 04060107.xhp
+msgctxt ""
+"04060107.xhp\n"
+"par_id61633516164519\n"
+"help.text"
+msgid "Press <keycode>Delete</keycode> to delete the array contents, including the array formula, or press <keycode>Backspace</keycode> and this brings up the <link href=\"text/scalc/01/02150000.xhp\" name=\"delete contents\">Delete Contents</link> dialog box. Select <emph>Formula</emph> or <emph>Delete All</emph> and click <emph>OK</emph>."
+msgstr ""
+
#. dEcVJ
#: 04060107.xhp
msgctxt ""
@@ -20266,69 +20293,6 @@ msgctxt ""
msgid "Beware that Calc's AutoCorrect function may modify double quotation marks. AutoCorrect should not change the double quotation marks within formula cells but may change those used in non-formula cells containing text. For example, if you copy a string that is surrounded by some other form of typographical double quotation marks, such as the left double quotation mark (U+201C) and the right double quotation mark (U+201D), and then paste into a formula cell, an error may result. Open the <emph>Double Quotes</emph> area of the <menuitem>Tools - AutoCorrect Options - Localized Options</menuitem> dialog to set the characters used to automatically correct the start and end typographical double quotation marks. Uncheck the <menuitem>Replace</menuitem> toggle button to disable the feature."
msgstr ""
-#. Gmvo8
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"bm_id3149384\n"
-"help.text"
-msgid "<bookmark_value>ARABIC function</bookmark_value>"
-msgstr "<bookmark_value>ARABIC 函式</bookmark_value>"
-
-#. SyuhN
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"hd_id3149384\n"
-"help.text"
-msgid "ARABIC"
-msgstr "ARABIC"
-
-#. 6Kjyp
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3153558\n"
-"help.text"
-msgid "<ahelp hid=\"HID_FUNC_ARABISCH\">Calculates the value of a Roman number. The value range must be between 0 and 3999.</ahelp>"
-msgstr "<ahelp hid=\"HID_FUNC_ARABISCH\">計算羅馬數字的值。值區域必須介於 0 與 3999 之間。</ahelp>"
-
-#. cwSkH
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3155523\n"
-"help.text"
-msgid "ARABIC(\"Text\")"
-msgstr "ARABIC(\"Text\")"
-
-#. AQA5o
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3151193\n"
-"help.text"
-msgid "<emph>Text</emph> is the text that represents a Roman number."
-msgstr "<emph>Text</emph> 是表示羅馬數字的文字。"
-
-#. dVD9Z
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3154621\n"
-"help.text"
-msgid "<item type=\"input\">=ARABIC(\"MXIV\")</item> returns 1014"
-msgstr "<item type=\"input\">=ARABIC(\"MXIV\")</item> 傳回 1014。"
-
-#. g4sEa
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3147553\n"
-"help.text"
-msgid "<item type=\"input\">=ARABIC(\"MMII\")</item> returns 2002"
-msgstr "<item type=\"input\">=ARABIC(\"MMII\")</item> 傳回 2002。"
-
#. teACB
#: 04060110.xhp
msgctxt ""
@@ -22264,114 +22228,6 @@ msgctxt ""
msgid "<item type=\"input\">RIGHTB(\"office\";3)</item> returns \"ice\" (3 non-DBCS characters each consisting of 1 byte)."
msgstr "<item type=\"input\">RIGHTB(\"office\";3)</item> 傳回 \"ice\" (三個非雙位元字元集字元,每個一位元)。 "
-#. 84zEq
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"bm_id3153534\n"
-"help.text"
-msgid "<bookmark_value>ROMAN function</bookmark_value>"
-msgstr "<bookmark_value>ROMAN 函式</bookmark_value>"
-
-#. 25vky
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"hd_id3153534\n"
-"help.text"
-msgid "ROMAN"
-msgstr "ROMAN"
-
-#. r5V5K
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3151256\n"
-"help.text"
-msgid "<ahelp hid=\"HID_FUNC_ROEMISCH\">Converts a number into a Roman numeral. The value range must be between 0 and 3999, the modes can be integers from 0 to 4.</ahelp>"
-msgstr "<ahelp hid=\"HID_FUNC_ROEMISCH\">將數字轉換成羅馬數字。數值必須介於 0 到 3999 之間,Mode 的值可以是 0 到 4 之間的整數。</ahelp>"
-
-#. RdCBS
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3150593\n"
-"help.text"
-msgid "ROMAN(Number [; Mode])"
-msgstr ""
-
-#. 4rcTC
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3156139\n"
-"help.text"
-msgid "<emph>Number</emph> is the number that is to be converted into a Roman numeral."
-msgstr "<emph>Number</emph> 為要轉換為羅馬數字的數字。"
-
-#. HEZFy
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3153318\n"
-"help.text"
-msgid "<emph>Mode</emph> (optional) indicates the degree of simplification. The higher the value, the greater is the simplification of the Roman number."
-msgstr "<emph>Mode</emph> (選擇性) 指定簡化程度。數值越高,羅馬數字就會越簡化。"
-
-#. Huw7f
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3151371\n"
-"help.text"
-msgid "<item type=\"input\">=ROMAN(999)</item> returns CMXCIX"
-msgstr "<item type=\"input\">=ROMAN(999)</item> 傳回 CMXCIX。"
-
-#. ACRz3
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3153938\n"
-"help.text"
-msgid "<item type=\"input\">=ROMAN(999;0)</item> returns CMXCIX"
-msgstr "<item type=\"input\">=ROMAN(999;0)</item> 傳回 CMXCIX。"
-
-#. mtbzC
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3148412\n"
-"help.text"
-msgid "<item type=\"input\">=ROMAN (999;1)</item> returns LMVLIV"
-msgstr "<item type=\"input\">=ROMAN (999;1)</item> 傳回 LMVLIV。"
-
-#. 8GQP5
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3155421\n"
-"help.text"
-msgid "<item type=\"input\">=ROMAN(999;2)</item> returns XMIX"
-msgstr "<item type=\"input\">=ROMAN(999;2)</item> 傳回 XMIX。"
-
-#. d8sji
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3149235\n"
-"help.text"
-msgid "<item type=\"input\">=ROMAN(999;3)</item> returns VMIV"
-msgstr "<item type=\"input\">=ROMAN(999;3)</item> 傳回 VMIV。"
-
-#. yDGse
-#: 04060110.xhp
-msgctxt ""
-"04060110.xhp\n"
-"par_id3150624\n"
-"help.text"
-msgid "<item type=\"input\">=ROMAN(999;4)</item> returns IM"
-msgstr "<item type=\"input\">=ROMAN(999;4)</item> 傳回 IM。"
-
#. q3uLN
#: 04060110.xhp
msgctxt ""
@@ -44260,13 +44116,13 @@ msgctxt ""
msgid "In the <emph>Formatting</emph> toolbar, click:"
msgstr ""
-#. sq4wv
+#. BCsAA
#: 05060000.xhp
msgctxt ""
"05060000.xhp\n"
"par_id521632804983642\n"
"help.text"
-msgid "<image id=\"img_id811632804983642\" src=\"cmd/sc_togglemergecells.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id921632804983642\">Icon</alt> </image>"
+msgid "<image id=\"img_id811632804983642\" src=\"cmd/sc_togglemergecells.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id921632804983642\">Icon Merge and Center Cells</alt></image>"
msgstr ""
#. 86yef
@@ -55906,6 +55762,96 @@ msgctxt ""
msgid "<link href=\"text/shared/optionen/01060500.xhp#hd_id3156199\">Automatically find column and row labels</link>"
msgstr ""
+#. czFkz
+#: func_arabic.xhp
+msgctxt ""
+"func_arabic.xhp\n"
+"tit\n"
+"help.text"
+msgid "ARABIC Function"
+msgstr ""
+
+#. ze8wK
+#: func_arabic.xhp
+msgctxt ""
+"func_arabic.xhp\n"
+"bm_id831542233029549\n"
+"help.text"
+msgid "<bookmark_value>ARABIC function</bookmark_value> <bookmark_value>text functions;convert roman numbers</bookmark_value>"
+msgstr ""
+
+#. BNUYi
+#: func_arabic.xhp
+msgctxt ""
+"func_arabic.xhp\n"
+"hd_id881628776094597\n"
+"help.text"
+msgid "<variable id=\"Arabic_h1\"><link href=\"text/scalc/01/func_arabic.xhp\" name=\"function ARABIC\">ARABIC</link></variable>"
+msgstr ""
+
+#. xPXrU
+#: func_arabic.xhp
+msgctxt ""
+"func_arabic.xhp\n"
+"par_id541542230672101\n"
+"help.text"
+msgid "<variable id=\"func_arabic_desc\"><ahelp hid=\".\">Returns the numeric value corresponding to a Roman number expressed as text.</ahelp></variable>"
+msgstr ""
+
+#. 2UE9g
+#: func_arabic.xhp
+msgctxt ""
+"func_arabic.xhp\n"
+"par_id151634221012221\n"
+"help.text"
+msgid "The largest Roman number that can be converted is MMMCMXCIX (or one of its simplified versions), which is equivalent to 3999."
+msgstr ""
+
+#. AueXr
+#: func_arabic.xhp
+msgctxt ""
+"func_arabic.xhp\n"
+"par_id701542231253817\n"
+"help.text"
+msgid "<input>ARABIC(Text)</input>"
+msgstr ""
+
+#. sWMEb
+#: func_arabic.xhp
+msgctxt ""
+"func_arabic.xhp\n"
+"par_id621542232197446\n"
+"help.text"
+msgid "<emph>Text</emph>: text representing a Roman number."
+msgstr ""
+
+#. WcE8r
+#: func_arabic.xhp
+msgctxt ""
+"func_arabic.xhp\n"
+"par_id451628776707264\n"
+"help.text"
+msgid "<input>=ARABIC(\"MXIV\")</input> returns the numeric value 1014."
+msgstr ""
+
+#. hDmDF
+#: func_arabic.xhp
+msgctxt ""
+"func_arabic.xhp\n"
+"par_id101628778036375\n"
+"help.text"
+msgid "<input>=ARABIC(\"MMII\")</input> returns the numeric value 2002."
+msgstr ""
+
+#. XAwC8
+#: func_arabic.xhp
+msgctxt ""
+"func_arabic.xhp\n"
+"par_id101628778036134\n"
+"help.text"
+msgid "<input>=ARABIC(\"\")</input> returns 0."
+msgstr ""
+
#. y9q7t
#: func_averageif.xhp
msgctxt ""
@@ -63538,13 +63484,13 @@ msgctxt ""
msgid "The output number is formatted as a valid floating point value and shown using the current cell's number format."
msgstr ""
-#. 2Ditv
+#. CdgXz
#: func_numbervalue.xhp
msgctxt ""
"func_numbervalue.xhp\n"
"par_id351625601754290\n"
"help.text"
-msgid "Refer to the <embedvar href=\"text/shared/01/05020300.xhp#NumbersLink\"/> help page to learn how to change the format of numbers in a cell."
+msgid "Refer to the <link href=\"text/shared/01/05020300.xhp\" name=\"num_format_link\">Numbers / Format</link> help page to learn how to change the format of numbers in a cell."
msgstr ""
#. vEdwF
@@ -64564,6 +64510,132 @@ msgctxt ""
msgid "Refer to the <link href=\"https://wiki.documentfoundation.org/Documentation/Calc_Functions/REPLACEB\" name=\"REPLACEB_Wiki\">REPLACEB</link> wiki page for more details about this function."
msgstr ""
+#. FuCCt
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"tit\n"
+"help.text"
+msgid "ROMAN Function"
+msgstr ""
+
+#. JqcvP
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"bm_id831542233029549\n"
+"help.text"
+msgid "<bookmark_value>ROMAN function</bookmark_value> <bookmark_value>text functions;convert to roman numbers</bookmark_value>"
+msgstr ""
+
+#. uXEPr
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"hd_id881628776094597\n"
+"help.text"
+msgid "<variable id=\"Roman_h1\"><link href=\"text/scalc/01/func_roman.xhp\" name=\"function ROMAN\">ROMAN</link></variable>"
+msgstr ""
+
+#. pdMgk
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"par_id541542230672101\n"
+"help.text"
+msgid "<variable id=\"func_roman_desc\"><ahelp hid=\".\">Converts a number into a Roman numeral. The value range must be between 0 and 3999. A simplification mode can be specified in the range from 0 to 4.</ahelp></variable>"
+msgstr ""
+
+#. tRsoC
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"par_id701542231253817\n"
+"help.text"
+msgid "<input>ROMAN(Number [; Mode])</input>"
+msgstr ""
+
+#. rz4bH
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"par_id621542232197446\n"
+"help.text"
+msgid "<emph>Number</emph>: the number that is to be converted into a Roman numeral."
+msgstr ""
+
+#. bfvWL
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"par_id621542232197337\n"
+"help.text"
+msgid "<emph>Mode</emph>: optional value ranging between 0 to 4 that indicates the degree of simplification to be used in the conversion. The higher the value, the greater is the simplification of the Roman number."
+msgstr ""
+
+#. BBUCq
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"par_id451628776707264\n"
+"help.text"
+msgid "<input>=ROMAN(999)</input> returns \"CMXCIX\" (uses simplification mode equal to zero, which is the default)."
+msgstr ""
+
+#. mBktA
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"par_id101628778036375\n"
+"help.text"
+msgid "<input>=ROMAN(999;0)</input> returns \"CMXCIX\"."
+msgstr ""
+
+#. fGqPj
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"par_id101628778036134\n"
+"help.text"
+msgid "<input>=ROMAN(999;1)</input> returns \"LMVLIV\"."
+msgstr ""
+
+#. qBbFo
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"par_id101628778036278\n"
+"help.text"
+msgid "<input>=ROMAN(999;2)</input> returns \"XMIX\"."
+msgstr ""
+
+#. AY5jP
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"par_id101628778036364\n"
+"help.text"
+msgid "<input>=ROMAN(999;3)</input> returns \"VMIV\"."
+msgstr ""
+
+#. B2aqT
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"par_id101628778036008\n"
+"help.text"
+msgid "<input>=ROMAN(999;4)</input> returns \"IM\"."
+msgstr ""
+
+#. CBuwx
+#: func_roman.xhp
+msgctxt ""
+"func_roman.xhp\n"
+"par_id101628778036019\n"
+"help.text"
+msgid "<input>=ROMAN(0)</input> returns \"\" (empty text)."
+msgstr ""
+
#. E7heY
#: func_roundsig.xhp
msgctxt ""
diff --git a/source/zh-TW/helpcontent2/source/text/scalc/guide.po b/source/zh-TW/helpcontent2/source/text/scalc/guide.po
index e666a9aba9f..97182bc2e5a 100644
--- a/source/zh-TW/helpcontent2/source/text/scalc/guide.po
+++ b/source/zh-TW/helpcontent2/source/text/scalc/guide.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-10-04 19:51+0200\n"
+"POT-Creation-Date: 2021-10-25 12:48+0200\n"
"PO-Revision-Date: 2019-08-09 08:00+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -9079,14 +9079,14 @@ msgctxt ""
msgid "Converting Text to Numbers"
msgstr "將文字轉換成數字"
-#. AzAoQ
+#. dP2GC
#: numbers_text.xhp
msgctxt ""
"numbers_text.xhp\n"
"bm_id3145068\n"
"help.text"
-msgid "<bookmark_value>formats; text as numbers</bookmark_value> <bookmark_value>time format conversion</bookmark_value> <bookmark_value>date formats;conversion</bookmark_value> <bookmark_value>converting;text, into numbers</bookmark_value>"
-msgstr "<bookmark_value>格式; 文字當作數字</bookmark_value> <bookmark_value>時間格式轉換</bookmark_value> <bookmark_value>日期格式; 轉換</bookmark_value> <bookmark_value>轉換; 文字, 轉為數字</bookmark_value>"
+msgid "<bookmark_value>formats; text as numbers</bookmark_value> <bookmark_value>time format conversion</bookmark_value> <bookmark_value>date formats;conversion</bookmark_value> <bookmark_value>converting;text, into numbers</bookmark_value>"
+msgstr ""
#. pqhdm
#: numbers_text.xhp
@@ -9313,13 +9313,13 @@ msgctxt ""
msgid "Changing the default text to number conversion settings"
msgstr ""
-#. FrQEr
+#. p9t4t
#: numbers_text.xhp
msgctxt ""
"numbers_text.xhp\n"
"par_id111567772433803\n"
"help.text"
-msgid "The text to number conversion can be customized in the <embedvar href=\"text/shared/optionen/detailedcalculation.xhp#detailed_heading\" markup=\"ignore\"/> option."
+msgid "The text to number conversion can be customized in the <link href=\"text/shared/optionen/detailedcalculation.xhp\" name=\"detailed_link\">Detailed Calculation Settings</link> option."
msgstr ""
#. WE8wt
@@ -10726,13 +10726,13 @@ msgctxt ""
msgid "Select the range of values from which duplicate values are to be removed. The values have to be arranged in a single column."
msgstr ""
-#. XvTTj
+#. 7fDQ9
#: remove_duplicates.xhp
msgctxt ""
"remove_duplicates.xhp\n"
"par_id31630021517873\n"
"help.text"
-msgid "Go to <menuitem>Data - More Filters - Standard Filter</menuitem>. This opens the <embedvar href=\"text/shared/02/12090100.xhp#StandardFilter_h1\"/> dialog."
+msgid "Go to <menuitem>Data - More Filters - Standard Filter</menuitem>. This opens the <link href=\"text/shared/02/12090100.xhp\" name=\"std_dialog_link\"> Standard Filter</link> dialog."
msgstr ""
#. EVEzq
@@ -12067,13 +12067,13 @@ msgctxt ""
msgid "Merge and Unmerge Cells"
msgstr ""
-#. AEABz
+#. FFV5z
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"bm_id501632012952361\n"
"help.text"
-msgid "<bookmark_value>merge/merging cells</bookmark_value> <bookmark_value>unmerge/unmerging cells</bookmark_value> <bookmark_value>split/splitting cells</bookmark_value>"
+msgid "<bookmark_value>merge/merging cells</bookmark_value> <bookmark_value>unmerge/unmerging cells</bookmark_value> <bookmark_value>split/splitting cells</bookmark_value>"
msgstr ""
#. BAqR3
@@ -12148,22 +12148,22 @@ msgctxt ""
msgid "Or, in the <emph>Properties</emph> sidebar mark the <emph>Merge Cells</emph> checkbox."
msgstr ""
-#. dzAEu
+#. fAjCD
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"par_id3154020\n"
"help.text"
-msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Merge Cells</menuitem>"
+msgid "Or, choose <menuitem>Format - Merge and Unmerge Cells - Merge Cells</menuitem>"
msgstr ""
-#. DbZBM
+#. 6VxQA
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"par_id6424146\n"
"help.text"
-msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Merge and Center Cells</menuitem>"
+msgid "Or, choose <menuitem>Format - Merge and Unmerge Cells - Merge and Center Cells</menuitem>"
msgstr ""
#. sHLpi
@@ -12220,22 +12220,22 @@ msgctxt ""
msgid "Or, in the <emph>Properties</emph> sidebar clear the <emph>Merge Cells</emph> checkbox."
msgstr ""
-#. zBdRG
+#. uiNiD
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"par_id9493087\n"
"help.text"
-msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Unmerge Cells</menuitem>."
+msgid "Or, choose <menuitem>Format - Merge and Unmerge Cells - Unmerge Cells</menuitem>."
msgstr ""
-#. YC7sa
+#. HJEzN
#: table_cellmerge.xhp
msgctxt ""
"table_cellmerge.xhp\n"
"par_id561632820960500\n"
"help.text"
-msgid "Or, toggle <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Merge and Center Cells</menuitem>"
+msgid "Or, toggle <menuitem>Format - Merge and Unmerge Cells - Merge and Center Cells</menuitem>"
msgstr ""
#. u5xXE
diff --git a/source/zh-TW/helpcontent2/source/text/sdatabase.po b/source/zh-TW/helpcontent2/source/text/sdatabase.po
index 54c74d1b578..328bfa1f0fb 100644
--- a/source/zh-TW/helpcontent2/source/text/sdatabase.po
+++ b/source/zh-TW/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-10-04 19:51+0200\n"
+"POT-Creation-Date: 2021-10-20 13:08+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -7564,76 +7564,76 @@ msgctxt ""
msgid "If you open the Database Wizard to create a database file for an existing database connection, there may be more steps to specify paths, authentication information, and more."
msgstr ""
-#. wFFQE
+#. A9JMA
#: dabawiz00.xhp
msgctxt ""
"dabawiz00.xhp\n"
"par_idN105F2\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">Set up text file connection</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02text.xhp\">Set up text file connection</link>"
msgstr ""
-#. 73X5w
+#. FWLbE
#: dabawiz00.xhp
msgctxt ""
"dabawiz00.xhp\n"
"par_idN10601\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">Set up Microsoft Access connection</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02access.xhp\">Set up Microsoft Access connection</link>"
msgstr ""
-#. ckemB
+#. LE9Go
#: dabawiz00.xhp
msgctxt ""
"dabawiz00.xhp\n"
"par_idN1062E\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">Set up ADO connection</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02ado.xhp\">Set up ADO connection</link>"
msgstr ""
-#. bbTEe
+#. BU6uL
#: dabawiz00.xhp
msgctxt ""
"dabawiz00.xhp\n"
"par_idN1070F\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02dbase.xhp\">Set up dBASE connection</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02dbase.xhp\">Set up dBASE connection</link>"
msgstr ""
-#. mM3XM
+#. TBaXt
#: dabawiz00.xhp
msgctxt ""
"dabawiz00.xhp\n"
"par_idN1063D\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">Set up JDBC connection</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02jdbc.xhp\">Set up JDBC connection</link>"
msgstr ""
-#. EB2yp
+#. F3Gju
#: dabawiz00.xhp
msgctxt ""
"dabawiz00.xhp\n"
"par_idN1064C\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">Set up Oracle database connection</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02oracle.xhp\">Set up Oracle database connection</link>"
msgstr ""
-#. sSrMX
+#. atGau
#: dabawiz00.xhp
msgctxt ""
"dabawiz00.xhp\n"
"par_idN1066A\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC settings</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02odbc.xhp\">ODBC settings</link>"
msgstr ""
-#. Jht8w
+#. wGT7W
#: dabawiz00.xhp
msgctxt ""
"dabawiz00.xhp\n"
"par_idN10679\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02spreadsheet.xhp\">Set up Spreadsheet connection</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02spreadsheet.xhp\">Set up Spreadsheet connection</link>"
msgstr ""
#. menWz
@@ -7807,22 +7807,22 @@ msgctxt ""
msgid "The next wizard page is one of the following pages:"
msgstr ""
-#. vaBGS
+#. 9fLay
#: dabawiz01.xhp
msgctxt ""
"dabawiz01.xhp\n"
"par_idN1061C\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">Set up text file connection</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02text.xhp\">Set up text file connection</link>"
msgstr ""
-#. NEWQn
+#. DeFrC
#: dabawiz01.xhp
msgctxt ""
"dabawiz01.xhp\n"
"par_idN1062B\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">Set up Microsoft Access or Microsoft Access 2007 connection</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02access.xhp\">Set up Microsoft Access or Microsoft Access 2007 connection</link>"
msgstr ""
#. NCWx8
@@ -7834,49 +7834,1516 @@ msgctxt ""
msgid "<link href=\"text/shared/explorer/database/dabawiz02ldap.xhp\">Set up LDAP connection</link>"
msgstr ""
-#. 29mSc
+#. 6qgTE
#: dabawiz01.xhp
msgctxt ""
"dabawiz01.xhp\n"
"par_idN10658\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">Set up ADO connection</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02ado.xhp\">Set up ADO connection</link>"
msgstr ""
-#. sUX3D
+#. oiGwh
#: dabawiz01.xhp
msgctxt ""
"dabawiz01.xhp\n"
"par_idN10667\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">Set up JDBC connection</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02jdbc.xhp\">Set up JDBC connection</link>"
msgstr ""
-#. BRUYG
+#. N55Na
#: dabawiz01.xhp
msgctxt ""
"dabawiz01.xhp\n"
"par_idN10676\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">Set up Oracle database connection</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02oracle.xhp\">Set up Oracle database connection</link>"
msgstr ""
-#. JtGv6
+#. c4YLM
#: dabawiz01.xhp
msgctxt ""
"dabawiz01.xhp\n"
"par_idN10694\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC settings</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02odbc.xhp\">ODBC settings</link>"
msgstr ""
-#. A69nZ
+#. zpfrv
#: dabawiz01.xhp
msgctxt ""
"dabawiz01.xhp\n"
"par_idN106A3\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02spreadsheet.xhp\">Set up Spreadsheet connection</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02spreadsheet.xhp\">Set up Spreadsheet connection</link>"
+msgstr ""
+
+#. SJaiE
+#: dabawiz02.xhp
+msgctxt ""
+"dabawiz02.xhp\n"
+"tit\n"
+"help.text"
+msgid "Save and proceed"
+msgstr ""
+
+#. Hjhen
+#: dabawiz02.xhp
+msgctxt ""
+"dabawiz02.xhp\n"
+"par_idN10544\n"
+"help.text"
+msgid "<link href=\"text/sdatabase/dabawiz02.xhp\">Save and proceed</link>"
+msgstr ""
+
+#. CECqo
+#: dabawiz02.xhp
+msgctxt ""
+"dabawiz02.xhp\n"
+"par_idN10554\n"
+"help.text"
+msgid "<ahelp hid=\".\">Specifies whether you want to register the database, open the database for editing, or insert a new table.</ahelp>"
+msgstr ""
+
+#. v3hCS
+#: dabawiz02.xhp
+msgctxt ""
+"dabawiz02.xhp\n"
+"par_idN10557\n"
+"help.text"
+msgid "Yes, register the Database for me"
+msgstr ""
+
+#. 6iEY2
+#: dabawiz02.xhp
+msgctxt ""
+"dabawiz02.xhp\n"
+"par_idN105B4\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select to register the database within your user copy of %PRODUCTNAME. After registering, the database is displayed in the <emph>View - Data Sources</emph> window. You must register a database to be able to insert the database fields in a document (Insert - Field - More Fields) or in a mail merge.</ahelp>"
+msgstr ""
+
+#. BDPbo
+#: dabawiz02.xhp
+msgctxt ""
+"dabawiz02.xhp\n"
+"par_idN105B7\n"
+"help.text"
+msgid "No, do not register the database"
+msgstr ""
+
+#. PHFCG
+#: dabawiz02.xhp
+msgctxt ""
+"dabawiz02.xhp\n"
+"par_idN105BB\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select to keep the database information only within the created database file.</ahelp>"
+msgstr ""
+
+#. xJFV8
+#: dabawiz02.xhp
+msgctxt ""
+"dabawiz02.xhp\n"
+"par_idN1055B\n"
+"help.text"
+msgid "Open the database for editing"
+msgstr ""
+
+#. 2oDVV
+#: dabawiz02.xhp
+msgctxt ""
+"dabawiz02.xhp\n"
+"par_idN105C6\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select to display the database file, where you can edit the database structure.</ahelp>"
+msgstr ""
+
+#. uUaJe
+#: dabawiz02.xhp
+msgctxt ""
+"dabawiz02.xhp\n"
+"par_idN1055F\n"
+"help.text"
+msgid "Create tables using the table wizard"
+msgstr ""
+
+#. F4TTD
+#: dabawiz02.xhp
+msgctxt ""
+"dabawiz02.xhp\n"
+"par_idN105D1\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select to call the <link href=\"text/shared/explorer/database/tablewizard00.xhp\">Table Wizard</link> after the Database Wizard is finished.</ahelp>"
+msgstr ""
+
+#. YnZ24
+#: dabawiz02access.xhp
+msgctxt ""
+"dabawiz02access.xhp\n"
+"tit\n"
+"help.text"
+msgid "Microsoft Access Connection"
+msgstr ""
+
+#. uUAxL
+#: dabawiz02access.xhp
+msgctxt ""
+"dabawiz02access.xhp\n"
+"bm_id2755516\n"
+"help.text"
+msgid "<bookmark_value>Access databases (base)</bookmark_value><bookmark_value>Microsoft Office;Access databases (base)</bookmark_value>"
+msgstr ""
+
+#. iPpLv
+#: dabawiz02access.xhp
+msgctxt ""
+"dabawiz02access.xhp\n"
+"par_idN1053D\n"
+"help.text"
+msgid "<variable id=\"access\"><link href=\"text/sdatabase/dabawiz02access.xhp\">Microsoft Access Connection</link></variable>"
+msgstr ""
+
+#. eMbAE
+#: dabawiz02access.xhp
+msgctxt ""
+"dabawiz02access.xhp\n"
+"par_idN10541\n"
+"help.text"
+msgid "<ahelp hid=\".\">Specifies the settings for importing a database file in Microsoft Access or Access 2007 format.</ahelp>"
+msgstr ""
+
+#. FJFQi
+#: dabawiz02access.xhp
+msgctxt ""
+"dabawiz02access.xhp\n"
+"par_id1142772\n"
+"help.text"
+msgid "See also the English Wiki page <link href=\"https://wiki.documentfoundation.org/MSA-Base_Faq\" name=\"wiki.documentfoundation.org MS Access Base FAQ\">https://wiki.documentfoundation.org/MSA-Base_Faq</link>."
+msgstr ""
+
+#. 7vvBT
+#: dabawiz02access.xhp
+msgctxt ""
+"dabawiz02access.xhp\n"
+"par_idN10544\n"
+"help.text"
+msgid "Microsoft Access database file"
+msgstr ""
+
+#. 5nSHE
+#: dabawiz02access.xhp
+msgctxt ""
+"dabawiz02access.xhp\n"
+"par_idN10548\n"
+"help.text"
+msgid "<ahelp hid=\".\">Specifies the path to the database file.</ahelp>"
+msgstr ""
+
+#. cKU7v
+#: dabawiz02access.xhp
+msgctxt ""
+"dabawiz02access.xhp\n"
+"par_idN1054B\n"
+"help.text"
+msgid "Browse"
+msgstr ""
+
+#. k4EM5
+#: dabawiz02access.xhp
+msgctxt ""
+"dabawiz02access.xhp\n"
+"par_idN1054F\n"
+"help.text"
+msgid "<ahelp hid=\".\">Click to open a file selection dialog.</ahelp>"
+msgstr ""
+
+#. gjtnv
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"tit\n"
+"help.text"
+msgid "ADO Connection"
+msgstr ""
+
+#. jJtjy
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"bm_id7565233\n"
+"help.text"
+msgid "<bookmark_value>ADO databases (Base)</bookmark_value><bookmark_value>MS ADO interface (Base)</bookmark_value><bookmark_value>databases;ADO (Base)</bookmark_value>"
+msgstr ""
+
+#. 9Yxn5
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN1054C\n"
+"help.text"
+msgid "<variable id=\"ado\"><link href=\"text/sdatabase/dabawiz02ado.xhp\">ADO Connection</link></variable>"
+msgstr ""
+
+#. Gi6xc
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN10550\n"
+"help.text"
+msgid "<ahelp hid=\".\">Specifies the options for adding an ADO (Microsoft ActiveX Data Objects) database.</ahelp>"
+msgstr ""
+
+#. pGwdA
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN10565\n"
+"help.text"
+msgid "The ADO interface is a Microsoft Windows proprietary container for connecting to databases."
+msgstr ""
+
+#. mVEj7
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN10568\n"
+"help.text"
+msgid "$[officename] requires the Microsoft Data Access Components (MDAC) to use the ADO interface. Microsoft Windows 2000 and XP include these components by default."
+msgstr ""
+
+#. CWQxx
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN1056B\n"
+"help.text"
+msgid "Data source URL"
+msgstr ""
+
+#. dEHxg
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN1056F\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter the data source URL.</ahelp>"
+msgstr ""
+
+#. AS8Ye
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN10572\n"
+"help.text"
+msgid "Example URLs"
+msgstr ""
+
+#. DGA9a
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN10576\n"
+"help.text"
+msgid "To connect to an Access 2000 file, use the format:"
+msgstr ""
+
+#. EYrtv
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN10579\n"
+"help.text"
+msgid "PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=c:\\Access\\nwind2000.mdb"
+msgstr ""
+
+#. JrQva
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN1057C\n"
+"help.text"
+msgid "To connect with a name to a catalog on a Microsoft SQL server that has a name turner, enter:"
+msgstr ""
+
+#. HeHcf
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN1057F\n"
+"help.text"
+msgid "PROVIDER=sqloledb;DATA SOURCE=turner;INITIAL CATALOG=First"
+msgstr ""
+
+#. eqFwU
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN10582\n"
+"help.text"
+msgid "To access an ODBC driver as a provider:"
+msgstr ""
+
+#. cibKq
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN10585\n"
+"help.text"
+msgid "DSN=SQLSERVER"
+msgstr ""
+
+#. FFdf5
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN10588\n"
+"help.text"
+msgid "Browse"
+msgstr ""
+
+#. xmZQB
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN1058C\n"
+"help.text"
+msgid "<ahelp hid=\".\">Click to open a database selection dialog.</ahelp>"
+msgstr ""
+
+#. Bi3az
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN10596\n"
+"help.text"
+msgid "A user name can have a maximum of 18 characters."
+msgstr ""
+
+#. iifVJ
+#: dabawiz02ado.xhp
+msgctxt ""
+"dabawiz02ado.xhp\n"
+"par_idN10599\n"
+"help.text"
+msgid "A password must contain 3 to 18 characters."
+msgstr ""
+
+#. mxSCU
+#: dabawiz02dbase.xhp
+msgctxt ""
+"dabawiz02dbase.xhp\n"
+"tit\n"
+"help.text"
+msgid "dBASE Connection"
+msgstr ""
+
+#. vDDMj
+#: dabawiz02dbase.xhp
+msgctxt ""
+"dabawiz02dbase.xhp\n"
+"par_idN1054A\n"
+"help.text"
+msgid "<variable id=\"dbase\"><link href=\"text/sdatabase/dabawiz02dbase.xhp\">dBASE Connection</link></variable>"
+msgstr ""
+
+#. 3rzAr
+#: dabawiz02dbase.xhp
+msgctxt ""
+"dabawiz02dbase.xhp\n"
+"par_idN10556\n"
+"help.text"
+msgid "Path to the dBASE files"
+msgstr ""
+
+#. 9qfqi
+#: dabawiz02dbase.xhp
+msgctxt ""
+"dabawiz02dbase.xhp\n"
+"par_idN1055A\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter the path to the dBASE *.dbf files.</ahelp>"
+msgstr ""
+
+#. JtErQ
+#: dabawiz02dbase.xhp
+msgctxt ""
+"dabawiz02dbase.xhp\n"
+"par_idN10571\n"
+"help.text"
+msgid "Browse"
+msgstr ""
+
+#. VHbhH
+#: dabawiz02dbase.xhp
+msgctxt ""
+"dabawiz02dbase.xhp\n"
+"par_idN10575\n"
+"help.text"
+msgid "<ahelp hid=\".\">Open a path selection dialog.</ahelp>"
+msgstr ""
+
+#. n9AxK
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"tit\n"
+"help.text"
+msgid "JDBC Connection"
+msgstr ""
+
+#. BSPeu
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"bm_id3726920\n"
+"help.text"
+msgid "<bookmark_value>JDBC; databases (Base)</bookmark_value><bookmark_value>databases; JDBC (Base)</bookmark_value>"
+msgstr ""
+
+#. nSDvF
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN105FC\n"
+"help.text"
+msgid "<variable id=\"jdbc\"><link href=\"text/sdatabase/dabawiz02jdbc.xhp\">JDBC Connection</link></variable>"
+msgstr ""
+
+#. 4vvDv
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN10600\n"
+"help.text"
+msgid "<ahelp hid=\".\">Specifies the options to access a <link href=\"text/shared/00/00000005.xhp#jdbc\" name=\"JDBC\">JDBC</link> database.</ahelp>"
+msgstr ""
+
+#. MAM5R
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN10623\n"
+"help.text"
+msgid "JDBC Examples"
+msgstr ""
+
+#. FAkVF
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN10627\n"
+"help.text"
+msgid "<item type=\"productname\">You can use a JDBC driver class to connect to a JDBC database from %PRODUCTNAME</item>. The driver class is provided by the database manufacturer. Two examples of JDBC databases are Oracle and MySQL."
+msgstr ""
+
+#. ehUZi
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN1062D\n"
+"help.text"
+msgid "The driver classes must be added to %PRODUCTNAME in <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - Advanced</menuitem>."
+msgstr ""
+
+#. KTrhC
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN10634\n"
+"help.text"
+msgid "Oracle database"
+msgstr ""
+
+#. Br2JC
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN10638\n"
+"help.text"
+msgid "You can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver."
+msgstr ""
+
+#. pei94
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN1064B\n"
+"help.text"
+msgid "On UNIX, ensure that the Oracle database client is installed with JDBC support. The JDBC driver class for the Solaris Oracle client version 8.x is located in the <Oracle client>/product/jdbc/lib/classes111.zip directory. You can also download the latest version from the Oracle web site."
+msgstr ""
+
+#. DifQh
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN10661\n"
+"help.text"
+msgid "In the <emph>Data source URL</emph> box, enter the location of the Oracle database server. The syntax of the URL depends on the database type. See the documentation that came with the JDBC driver for more information."
+msgstr ""
+
+#. BBFrJ
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN10668\n"
+"help.text"
+msgid "For an Oracle database, the syntax of the URL is:"
+msgstr ""
+
+#. 7tbob
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN1066B\n"
+"help.text"
+msgid "oracle:thin:@hostname:port:database_name"
+msgstr ""
+
+#. RiDDR
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN10674\n"
+"help.text"
+msgid "hostname is the name of the machine that runs the Oracle database. You can also replace hostname with the IP address of the server."
+msgstr ""
+
+#. sFfhQ
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN10678\n"
+"help.text"
+msgid "port is the port where the Oracle database listens. Ask your database administrator for the correct port address."
+msgstr ""
+
+#. GDkVv
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN1067C\n"
+"help.text"
+msgid "database_name is the name of the Oracle database. Ask your database administrator for the correct name."
+msgstr ""
+
+#. aQiqR
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN1067F\n"
+"help.text"
+msgid "MySQL database"
+msgstr ""
+
+#. FEV5u
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN10683\n"
+"help.text"
+msgid "The driver for the MySQL database is available on the MySQL web site."
+msgstr ""
+
+#. p2v67
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN10689\n"
+"help.text"
+msgid "The syntax for a MySQL database is:"
+msgstr ""
+
+#. wEDsL
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN1068C\n"
+"help.text"
+msgid "mysql://hostname:port/database_name"
+msgstr ""
+
+#. m5Kcx
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN10695\n"
+"help.text"
+msgid "<ahelp hid=\".\">hostname is the name of the machine that runs the MySQL database.</ahelp> You can also replace hostname with the IP address of the server."
+msgstr ""
+
+#. LCpew
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN10699\n"
+"help.text"
+msgid "port is the default port for MySQL databases, namely 3306."
+msgstr ""
+
+#. q2DuM
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN1069D\n"
+"help.text"
+msgid "database_name is the name of the database."
+msgstr ""
+
+#. YYgSg
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN106A0\n"
+"help.text"
+msgid "Data source URL"
+msgstr ""
+
+#. EcdaK
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN106A4\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter the URL for the database. For example, for the MySQL JDBC driver, enter \"mysql://<Servername>/<name of the database>\". For more information on the JDBC driver, consult the documentation that came with the driver.</ahelp>"
+msgstr ""
+
+#. eVBSr
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN106BB\n"
+"help.text"
+msgid "JDBC Driver Class"
+msgstr ""
+
+#. vFsoP
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN106BF\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter the name of the JDBC driver.</ahelp>"
+msgstr ""
+
+#. VHjhA
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_id7953733\n"
+"help.text"
+msgid "Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - Advanced</menuitem>, and click the <widget>Class Path</widget> button. After you add the path information, restart %PRODUCTNAME."
+msgstr ""
+
+#. f8fUr
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN106CE\n"
+"help.text"
+msgid "Test Class"
+msgstr ""
+
+#. 8VBbq
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN106E4\n"
+"help.text"
+msgid "<ahelp hid=\".\">Tests the connection with the current settings.</ahelp>"
+msgstr ""
+
+#. FGezr
+#: dabawiz02jdbc.xhp
+msgctxt ""
+"dabawiz02jdbc.xhp\n"
+"par_idN106E7\n"
+"help.text"
+msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
+msgstr ""
+
+#. Y4EFA
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"tit\n"
+"help.text"
+msgid "MariaDB and MySQL Connection"
+msgstr ""
+
+#. bVNAZ
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"bm_id861587404584956\n"
+"help.text"
+msgid "<bookmark_value>MariaDB settings (Base)</bookmark_value><bookmark_value>MySQL settings (Base)</bookmark_value>"
+msgstr ""
+
+#. MseiS
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_idN10549\n"
+"help.text"
+msgid "<variable id=\"mysql\"><link href=\"text/sdatabase/dabawiz02mysql.xhp\">MariaDB and MySQL Connection</link></variable>"
+msgstr ""
+
+#. 5FPU6
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_idN1054D\n"
+"help.text"
+msgid "<ahelp hid=\".\">Specifies the options for MariaDB and MySQL databases.</ahelp>"
+msgstr ""
+
+#. Bmcwo
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"hd_id661587405298284\n"
+"help.text"
+msgid "Direct Connection for MariaDB and MySQL databases"
+msgstr ""
+
+#. vd9VD
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"hd_id321587405303769\n"
+"help.text"
+msgid "Database name"
+msgstr ""
+
+#. 6LAsi
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_id371587405314376\n"
+"help.text"
+msgid "Enter the name of the MariaDB or MySQL database. Ask your database administrator for the correct name."
+msgstr ""
+
+#. jbdZp
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"hd_id561587405334695\n"
+"help.text"
+msgid "Server URL"
+msgstr ""
+
+#. SshYk
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_id521587405341138\n"
+"help.text"
+msgid "Enter the URL for the database server. This is the name of the machine that runs the MariaDB or MySQL database. You can also replace hostname with the IP address of the server."
+msgstr ""
+
+#. MZQiq
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"hd_id171587405349438\n"
+"help.text"
+msgid "Port number"
+msgstr ""
+
+#. J2SR3
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_id1001587405358390\n"
+"help.text"
+msgid "Enter the port number for the database server. Ask your database administrator for the correct port address. The default port number for MySQL or MariaDB databases is 3306."
+msgstr ""
+
+#. ovKhU
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"hd_id121587407845730\n"
+"help.text"
+msgid "Named Pipe"
+msgstr ""
+
+#. Rq89B
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_id941587407987180\n"
+"help.text"
+msgid "If the MariaDB or MySQL database is to be accessed by a named pipe, enter its name."
+msgstr ""
+
+#. wF6bj
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"hd_id161587405553671\n"
+"help.text"
+msgid "Socket"
+msgstr ""
+
+#. e8DB2
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_id161587405561472\n"
+"help.text"
+msgid "If the MariaDB or MySQL database is to be accessed by a socket, enter the socket ID."
+msgstr ""
+
+#. fpBNu
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_idN10562\n"
+"help.text"
+msgid "Connect using ODBC (Open Database Connectivity)"
+msgstr ""
+
+#. E7sE2
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_idN10566\n"
+"help.text"
+msgid "<ahelp hid=\".\">Connects to an existing ODBC data source that was set on a system level.</ahelp>"
+msgstr ""
+
+#. AXrwJ
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_idN10569\n"
+"help.text"
+msgid "Connect using JDBC (Java Database Connectivity)"
+msgstr ""
+
+#. i9TrE
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_idN1056D\n"
+"help.text"
+msgid "<ahelp hid=\".\">Connects to an existing JDBC data source that was set on a system level.</ahelp>"
+msgstr ""
+
+#. FUG3D
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_idN10570\n"
+"help.text"
+msgid "The next wizard page depends on your choice of ODBC or JDBC:"
+msgstr ""
+
+#. VYcYK
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_idN10573\n"
+"help.text"
+msgid "<link href=\"text/sdatabase/dabawiz02odbc.xhp\">ODBC Connection</link>"
+msgstr ""
+
+#. DABkC
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_idN10582\n"
+"help.text"
+msgid "<link href=\"text/sdatabase/dabawiz02jdbc.xhp\">JDBC Connection</link>"
+msgstr ""
+
+#. ujaGF
+#: dabawiz02mysql.xhp
+msgctxt ""
+"dabawiz02mysql.xhp\n"
+"par_idN10591\n"
+"help.text"
+msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
+msgstr ""
+
+#. HF588
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"tit\n"
+"help.text"
+msgid "ODBC Connection"
+msgstr ""
+
+#. sGNau
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"bm_id3149031\n"
+"help.text"
+msgid "<bookmark_value>ODBC;database (Base)</bookmark_value><bookmark_value>databases;ODBC (Base)</bookmark_value>"
+msgstr ""
+
+#. SNzJc
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"par_idN1053D\n"
+"help.text"
+msgid "<variable id=\"odbc\"><link href=\"text/sdatabase/dabawiz02odbc.xhp\">ODBC Connection</link></variable>"
+msgstr ""
+
+#. nb3Qq
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"par_idN10541\n"
+"help.text"
+msgid "<ahelp hid=\".\">Specifies the settings for <link href=\"text/shared/00/00000005.xhp#odbc\" name=\"ODBC\">ODBC</link> databases.</ahelp>"
+msgstr ""
+
+#. WhLBW
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"par_id8856776\n"
+"help.text"
+msgid "To edit or add records to a database table in $[officename], the table must have a unique index field."
+msgstr ""
+
+#. xs2Yc
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"par_id8034302\n"
+"help.text"
+msgid "On Solaris and Linux platforms, try to use a JDBC driver instead of an ODBC driver. See http://www.unixodbc.org for an ODBC implementation on Solaris or Linux."
+msgstr ""
+
+#. PxZ9T
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"par_id8560136\n"
+"help.text"
+msgid "To connect to a Microsoft Access database on Windows, use the ADO or Access database interface, rather than ODBC."
+msgstr ""
+
+#. vme6U
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"par_id2082583\n"
+"help.text"
+msgid "Drivers for ODBC are supplied and supported by the manufacturer of the database. $[officename] only supports the ODBC 3 standard."
+msgstr ""
+
+#. wCexE
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"par_idN10552\n"
+"help.text"
+msgid "Name of the ODBC database"
+msgstr ""
+
+#. eubaF
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"par_idN10556\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter the path to the database file.</ahelp>"
+msgstr ""
+
+#. 7KKFy
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"par_idN10559\n"
+"help.text"
+msgid "Browse"
+msgstr ""
+
+#. CSCAZ
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"par_idN1055D\n"
+"help.text"
+msgid "<ahelp hid=\".\">Click to open an ODBC data source selection dialog:</ahelp>"
+msgstr ""
+
+#. 48ubg
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"par_idN10560\n"
+"help.text"
+msgid "Choose a data source"
+msgstr ""
+
+#. FhAAU
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"par_idN10564\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select a data source to which you want to connect using ODBC. Then click <emph>OK</emph>.</ahelp>"
+msgstr ""
+
+#. WaAZB
+#: dabawiz02odbc.xhp
+msgctxt ""
+"dabawiz02odbc.xhp\n"
+"par_idN10567\n"
+"help.text"
+msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
+msgstr ""
+
+#. RL7sk
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"tit\n"
+"help.text"
+msgid "Oracle Database Connection"
+msgstr ""
+
+#. 8H3zh
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"bm_id5900753\n"
+"help.text"
+msgid "<bookmark_value>Oracle databases (base)</bookmark_value>"
+msgstr ""
+
+#. W6aaT
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN105A4\n"
+"help.text"
+msgid "Oracle Database Connection"
+msgstr ""
+
+#. DbqoE
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN105A8\n"
+"help.text"
+msgid "<ahelp hid=\".\">Specifies the options to access an Oracle database.</ahelp>"
+msgstr ""
+
+#. FMq7o
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN105BD\n"
+"help.text"
+msgid "Oracle database"
+msgstr ""
+
+#. 8qHyA
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN105C1\n"
+"help.text"
+msgid "You can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver."
+msgstr ""
+
+#. sSDYq
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN105D4\n"
+"help.text"
+msgid "On UNIX, ensure that the Oracle database client is installed with JDBC support. The JDBC driver class for the Solaris Oracle client version 8.x is located in the <Oracle client>/product/jdbc/lib/classes111.zip directory. You can also download the latest version of the driver from the Oracle web site."
+msgstr ""
+
+#. 5rxmX
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN10608\n"
+"help.text"
+msgid "Name of the Oracle database"
+msgstr ""
+
+#. DxYWQ
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN1060C\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter the name of the Oracle database. Ask your database administrator for the correct name.</ahelp>"
+msgstr ""
+
+#. WKBSR
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN1060F\n"
+"help.text"
+msgid "Server URL"
+msgstr ""
+
+#. vXDGs
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN10613\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter the URL for the database server. This is the name of the machine that runs the Oracle database. You can also replace hostname with the IP address of the server.</ahelp>"
+msgstr ""
+
+#. EEESV
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN10616\n"
+"help.text"
+msgid "Port number"
+msgstr ""
+
+#. PBuEW
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN1061A\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter the port number for the database server. Ask your database administrator for the correct port address.</ahelp>"
+msgstr ""
+
+#. rYRxW
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN1061D\n"
+"help.text"
+msgid "Oracle JDBC Driver Class"
+msgstr ""
+
+#. ouDxa
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN10621\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter the name of the JDBC driver.</ahelp>"
+msgstr ""
+
+#. JumUz
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN10630\n"
+"help.text"
+msgid "Test Class"
+msgstr ""
+
+#. NdF7k
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN10634\n"
+"help.text"
+msgid "<ahelp hid=\".\">Tests the connection with the current settings.</ahelp>"
+msgstr ""
+
+#. UwteE
+#: dabawiz02oracle.xhp
+msgctxt ""
+"dabawiz02oracle.xhp\n"
+"par_idN10637\n"
+"help.text"
+msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
+msgstr ""
+
+#. XoiBM
+#: dabawiz02spreadsheet.xhp
+msgctxt ""
+"dabawiz02spreadsheet.xhp\n"
+"tit\n"
+"help.text"
+msgid "Spreadsheet Database Connection"
+msgstr ""
+
+#. cwGbM
+#: dabawiz02spreadsheet.xhp
+msgctxt ""
+"dabawiz02spreadsheet.xhp\n"
+"par_idN1053A\n"
+"help.text"
+msgid "Set up Spreadsheet connection"
+msgstr ""
+
+#. fZnvG
+#: dabawiz02spreadsheet.xhp
+msgctxt ""
+"dabawiz02spreadsheet.xhp\n"
+"par_idN1053E\n"
+"help.text"
+msgid "Location and file name"
+msgstr ""
+
+#. 6TKT4
+#: dabawiz02spreadsheet.xhp
+msgctxt ""
+"dabawiz02spreadsheet.xhp\n"
+"par_idN10542\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter the path and file name to the spreadsheet file.</ahelp>"
+msgstr ""
+
+#. XtNjY
+#: dabawiz02spreadsheet.xhp
+msgctxt ""
+"dabawiz02spreadsheet.xhp\n"
+"par_idN10545\n"
+"help.text"
+msgid "Browse"
+msgstr ""
+
+#. JfUMC
+#: dabawiz02spreadsheet.xhp
+msgctxt ""
+"dabawiz02spreadsheet.xhp\n"
+"par_idN10549\n"
+"help.text"
+msgid "<ahelp hid=\".\">Click to open a file selection dialog.</ahelp>"
+msgstr ""
+
+#. JAmAi
+#: dabawiz02spreadsheet.xhp
+msgctxt ""
+"dabawiz02spreadsheet.xhp\n"
+"par_idN1054C\n"
+"help.text"
+msgid "Password required"
+msgstr ""
+
+#. 3HzmH
+#: dabawiz02spreadsheet.xhp
+msgctxt ""
+"dabawiz02spreadsheet.xhp\n"
+"par_idN10550\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select to request a password from the user of the database document.</ahelp>"
+msgstr ""
+
+#. xngE4
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"tit\n"
+"help.text"
+msgid "Text File Connection"
+msgstr ""
+
+#. dfWU7
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"bm_id2517166\n"
+"help.text"
+msgid "<bookmark_value>tables in databases;importing text formats (Base)</bookmark_value><bookmark_value>text databases (Base)</bookmark_value>"
+msgstr ""
+
+#. htUUB
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN1054F\n"
+"help.text"
+msgid "Set up a connection to text files"
+msgstr ""
+
+#. MD2eT
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN10553\n"
+"help.text"
+msgid "<ahelp hid=\".\">Specifies the settings for importing a database in text format.</ahelp>"
+msgstr ""
+
+#. 6yKNw
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN10568\n"
+"help.text"
+msgid "In a text format database, data is stored in an unformatted ASCII file, where each record comprises a row. The data fields are divided by separators. Text in the data fields is divided by quotation marks."
+msgstr ""
+
+#. puYrF
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN1056B\n"
+"help.text"
+msgid "Path to text files"
+msgstr ""
+
+#. LkFcD
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN1056F\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter the path to the text file or files. If you just want one text file, you can use any extension of the file name. If you enter a folder name, the text files in that folder must have the extension *.csv to be recognized as files of the text database.</ahelp>"
+msgstr ""
+
+#. DwHAY
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN10572\n"
+"help.text"
+msgid "Browse"
+msgstr ""
+
+#. tU8mG
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN10576\n"
+"help.text"
+msgid "<ahelp hid=\".\">Click to open a file selection dialog.</ahelp>"
+msgstr ""
+
+#. MmGr4
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN10616\n"
+"help.text"
+msgid "Plain text files (*.txt)"
+msgstr ""
+
+#. ztjWn
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN1061A\n"
+"help.text"
+msgid "<ahelp hid=\".\">Click to access txt files.</ahelp>"
+msgstr ""
+
+#. E5S76
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN10643\n"
+"help.text"
+msgid "'Comma separated value' files (*.csv)"
+msgstr ""
+
+#. 2fDr2
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN10647\n"
+"help.text"
+msgid "<ahelp hid=\".\">Click to access csv files.</ahelp>"
+msgstr ""
+
+#. EVBCK
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN10666\n"
+"help.text"
+msgid "Custom"
+msgstr ""
+
+#. 3Z5fx
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN1066A\n"
+"help.text"
+msgid "<ahelp hid=\".\">Click to access custom files. Enter the extension in the text box.</ahelp>"
+msgstr ""
+
+#. rts2F
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN10581\n"
+"help.text"
+msgid "Field separator"
+msgstr ""
+
+#. 3G6QU
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN10585\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter or select the character that separates data fields in the text file.</ahelp>"
+msgstr ""
+
+#. 8rxWL
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN1059C\n"
+"help.text"
+msgid "Text separator"
+msgstr ""
+
+#. ejFpV
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN105A0\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter or select the character that identifies a text field in the text file.</ahelp> You cannot use the same character as the field separator."
+msgstr ""
+
+#. rSTcV
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN105B8\n"
+"help.text"
+msgid "Decimal separator"
+msgstr ""
+
+#. apBAu
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN105BC\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter or select the character that is used as a decimal separator in the text file, for example, a period (0.5) or a comma (0,5).</ahelp>"
+msgstr ""
+
+#. CyhGN
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN105D3\n"
+"help.text"
+msgid "Thousands separator"
+msgstr ""
+
+#. 6TTiq
+#: dabawiz02text.xhp
+msgctxt ""
+"dabawiz02text.xhp\n"
+"par_idN105D7\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter or select the character that is used as a thousands separator in the text file, for example a comma (1,000), or a period (1.000).</ahelp>"
msgstr ""
#. YSNPt
@@ -7960,13 +9427,13 @@ msgctxt ""
msgid "<ahelp hid=\".\">Check if the configured connection can be used to access the database.</ahelp>"
msgstr ""
-#. 9d4Bh
+#. dF4Mp
#: dabawiz03auth.xhp
msgctxt ""
"dabawiz03auth.xhp\n"
"par_idN1054F\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02.xhp\">Save and proceed</link>"
+msgid "<link href=\"text/sdatabase/dabawiz02.xhp\">Save and proceed</link>"
msgstr ""
#. cLmBi
diff --git a/source/zh-TW/helpcontent2/source/text/sdraw.po b/source/zh-TW/helpcontent2/source/text/sdraw.po
index 25a0740074e..de49e3e9ff0 100644
--- a/source/zh-TW/helpcontent2/source/text/sdraw.po
+++ b/source/zh-TW/helpcontent2/source/text/sdraw.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-20 13:03+0200\n"
+"POT-Creation-Date: 2021-10-20 13:08+0200\n"
"PO-Revision-Date: 2018-01-30 06:55+0000\n"
"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1168,15 +1168,6 @@ msgctxt ""
msgid "<link href=\"text/sdraw/01/page_properties.xhp\" name=\"Properties\">Properties</link>"
msgstr ""
-#. ESkBn
-#: main_page.xhp
-msgctxt ""
-"main_page.xhp\n"
-"hd_id371566154570590\n"
-"help.text"
-msgid "Master Page"
-msgstr ""
-
#. 2pA94
#: main_page.xhp
msgctxt ""
diff --git a/source/zh-TW/helpcontent2/source/text/sdraw/00.po b/source/zh-TW/helpcontent2/source/text/sdraw/00.po
index dcb61320d11..7def6d5f488 100644
--- a/source/zh-TW/helpcontent2/source/text/sdraw/00.po
+++ b/source/zh-TW/helpcontent2/source/text/sdraw/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:42+0100\n"
+"POT-Creation-Date: 2021-10-20 13:08+0200\n"
"PO-Revision-Date: 2017-05-10 11:12+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -79,6 +79,15 @@ msgctxt ""
msgid "<variable id=\"seitenvorlage\">Choose <menuitem>Page - Master Page</menuitem> </variable>"
msgstr ""
+#. DjtXM
+#: page_menu.xhp
+msgctxt ""
+"page_menu.xhp\n"
+"par_id911634055593609\n"
+"help.text"
+msgid "<variable id=\"loadpagedesign\">Choose <menuitem>Page - Master Page - Load</menuitem></variable>"
+msgstr ""
+
#. paRMk
#: page_menu.xhp
msgctxt ""
@@ -97,13 +106,13 @@ msgctxt ""
msgid "On the <emph>Insert</emph> bar, click"
msgstr ""
-#. Ldrnc
+#. kCGEr
#: page_menu.xhp
msgctxt ""
"page_menu.xhp\n"
"par_id351556823072396\n"
"help.text"
-msgid "<image id=\"img_id381556823072396\" src=\"cmd/sc_insertpage.png\" width=\"0.566cm\" height=\"0.566cm\"><alt id=\"alt_id381556823072396\">Icon</alt></image>"
+msgid "<image id=\"img_id381556823072396\" src=\"cmd/sc_insertpage.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id381556823072396\">Icon New Page</alt></image>"
msgstr ""
#. xbkHm
diff --git a/source/zh-TW/helpcontent2/source/text/sdraw/01.po b/source/zh-TW/helpcontent2/source/text/sdraw/01.po
index 4aa10b23593..2350556511e 100644
--- a/source/zh-TW/helpcontent2/source/text/sdraw/01.po
+++ b/source/zh-TW/helpcontent2/source/text/sdraw/01.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-06-24 12:51+0200\n"
+"POT-Creation-Date: 2021-10-25 12:48+0200\n"
"PO-Revision-Date: 2017-05-10 11:12+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -601,13 +601,13 @@ msgctxt ""
msgid "The previous text box objects are deleted after consolidation."
msgstr ""
-#. 6AkKv
+#. bGEES
#: consolidatetext.xhp
msgctxt ""
"consolidatetext.xhp\n"
"par_id531623515498932\n"
"help.text"
-msgid "Consolidation of lists requires attention to restore the list layout that has been affected by the position of the punctuation. This includes the case of numbering of style \"1.\", where he resulting list items are split after the dot."
+msgid "Consolidation of lists requires attention to restore the list layout that has been affected by the position of the punctuation. This includes the case of numbering of style \"1.\", where the resulting list items are split after the dot."
msgstr ""
#. VwP6B
diff --git a/source/zh-TW/helpcontent2/source/text/shared/00.po b/source/zh-TW/helpcontent2/source/text/shared/00.po
index 9babe3b935f..6b8d24acba5 100644
--- a/source/zh-TW/helpcontent2/source/text/shared/00.po
+++ b/source/zh-TW/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-09-20 13:03+0200\n"
+"POT-Creation-Date: 2021-10-20 13:08+0200\n"
"PO-Revision-Date: 2020-07-28 14:35+0000\n"
"Last-Translator: sophie <gautier.sophie@gmail.com>\n"
"Language-Team: Chinese (Traditional) <https://weblate.documentfoundation.org/projects/libo_help-master/textshared00/zh_Hant/>\n"
@@ -6118,6 +6118,24 @@ msgctxt ""
msgid "<ahelp hid=\"modules/swriter/ui/asciifilterdialog/charset\">Specifies the character set of the file for export or import.</ahelp>"
msgstr "<ahelp hid=\"modules/swriter/ui/asciifilterdialog/charset\">指定所匯出或匯入檔案的字元集。</ahelp>"
+#. G7B9v
+#: 00000215.xhp
+msgctxt ""
+"00000215.xhp\n"
+"hd_id911633520416200\n"
+"help.text"
+msgid "Include byte-order mark"
+msgstr ""
+
+#. 5G2v5
+#: 00000215.xhp
+msgctxt ""
+"00000215.xhp\n"
+"par_id211633520423767\n"
+"help.text"
+msgid "For Unicode character set only, a byte order mark (BOM) is a sequence of bytes used to indicate Unicode encoding of a text file. The presence of the UTF-8 BOM is optional and may cause problems with some software, especially legacy software not designed to handle UTF-8."
+msgstr ""
+
#. PSvbB
#: 00000215.xhp
msgctxt ""
diff --git a/source/zh-TW/helpcontent2/source/text/shared/01.po b/source/zh-TW/helpcontent2/source/text/shared/01.po
index 513a45be7f7..c1abce51ee3 100644
--- a/source/zh-TW/helpcontent2/source/text/shared/01.po
+++ b/source/zh-TW/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-10-04 19:51+0200\n"
+"POT-Creation-Date: 2021-10-25 12:48+0200\n"
"PO-Revision-Date: 2019-08-09 08:02+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14929,6 +14929,204 @@ msgctxt ""
msgid "<variable id=\"quellaus\"><ahelp hid=\".uno:TwainSelect\" visibility=\"visible\">Selects the scanner that you want to use.</ahelp></variable>"
msgstr "<variable id=\"quellaus\"><ahelp hid=\".uno:TwainSelect\" visibility=\"visible\">選取要使用的掃描器。</ahelp></variable>"
+#. AJ5Lv
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"par_id661633376449596\n"
+"help.text"
+msgid "The dialog displays settings for the selected scanner and the scan job."
+msgstr ""
+
+#. t6BMj
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"hd_id721633369239013\n"
+"help.text"
+msgid "Sources"
+msgstr ""
+
+#. GvcAB
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"par_id361633369288384\n"
+"help.text"
+msgid "Displays a list of available scanners detected in your system. Click on a scanner in the list and press <emph>Select</emph> to open the scanner configuration dialog. The configuration dialog depends on the scanner driver installed."
+msgstr ""
+
+#. Caooc
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"hd_id511633368095174\n"
+"help.text"
+msgid "Scan Area"
+msgstr ""
+
+#. vYcZn
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"hd_id991633368100151\n"
+"help.text"
+msgid "Left, right, top, bottom"
+msgstr ""
+
+#. mncAH
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"par_id561633368111347\n"
+"help.text"
+msgid "Set the margins of the scan area."
+msgstr ""
+
+#. wmUp5
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"hd_id81633368116162\n"
+"help.text"
+msgid "Preview"
+msgstr ""
+
+#. GFTiz
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"par_id811633368127119\n"
+"help.text"
+msgid "Displays a preview of the scanned image. The preview area contains eight handles. Drag the handles to adjust the scan area or enter a value in the corresponding margin spin box."
+msgstr ""
+
+#. SQG8n
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"hd_id181633369359784\n"
+"help.text"
+msgid "Device used"
+msgstr ""
+
+#. vtMfF
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"par_id311633371297646\n"
+"help.text"
+msgid "Select the scanner device in the list of devices detected by your system."
+msgstr ""
+
+#. PAHaK
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"hd_id161633369549370\n"
+"help.text"
+msgid "Resolution [DPI]"
+msgstr ""
+
+#. jTyuD
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"par_id401633369701424\n"
+"help.text"
+msgid "Select the resolution in dots per inch for the scan job. The available resolutions depends on the scanner driver."
+msgstr ""
+
+#. F5SoB
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"hd_id351633369697474\n"
+"help.text"
+msgid "Show advanced options"
+msgstr ""
+
+#. Hj5EW
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"par_id771633369733491\n"
+"help.text"
+msgid "Mark this checkbox to display more configuration options for the scanner device. The set of options is displayed in the <emph>Options</emph> box and depends on the scanner driver."
+msgstr ""
+
+#. 6qqQP
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"hd_id461633370147200\n"
+"help.text"
+msgid "Options"
+msgstr ""
+
+#. JtCux
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"par_id761633371067498\n"
+"help.text"
+msgid "Displays the list of available scanner driver advanced options. Double click an option to display its contents just below. The option and its values depends on the scanner driver."
+msgstr ""
+
+#. DFbzA
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"hd_id461633371554790\n"
+"help.text"
+msgid "About Device"
+msgstr ""
+
+#. 2DSpo
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"par_id821633371816925\n"
+"help.text"
+msgid "Displays a popup window with information obtained from the scanner driver: device address, vendor, scanner model and type of scanner."
+msgstr ""
+
+#. HCSD9
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"hd_id971633371559920\n"
+"help.text"
+msgid "Create preview"
+msgstr ""
+
+#. T4Tgs
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"par_id431633375721518\n"
+"help.text"
+msgid "Scans and displays the document in the preview area. Use the <emph>Create Preview</emph> command to view a sample of the scanned document and set the scan job properties."
+msgstr ""
+
+#. YL3KE
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"hd_id151633371565195\n"
+"help.text"
+msgid "Scan"
+msgstr ""
+
+#. zWLcX
+#: 04060100.xhp
+msgctxt ""
+"04060100.xhp\n"
+"par_id851633375846639\n"
+"help.text"
+msgid "Scans an image, and then inserts the result into the document and closes the dialog."
+msgstr ""
+
#. qDEzX
#: 04060200.xhp
msgctxt ""
@@ -22327,13 +22525,13 @@ msgctxt ""
msgid "The <emph>Remove border</emph> option in the <emph>Adjacent Cells</emph> section determines if borders in the edges of the selected range are to be removed. Leave this option unchecked if edge borders should be left unchanged."
msgstr ""
-#. VPwsL
+#. PjDF8
#: 05030500.xhp
msgctxt ""
"05030500.xhp\n"
"par_id181630450040456\n"
"help.text"
-msgid "Read the help page <embedvar href=\"text/scalc/guide/borders.xhp#borders\"/> to learn more on how to define custom line arrangements."
+msgid "Read the help page <link href=\"text/scalc/guide/borders.xhp\">User Defined Borders in Cells</link> to learn more on how to define custom line arrangements."
msgstr ""
#. 2SFo2
@@ -24910,14 +25108,32 @@ msgctxt ""
msgid "<ahelp hid=\".\">Horizontally centers the selected objects. If only one object is selected in Draw or Impress, the center of the object is aligned to the horizontal center of the page.</ahelp>"
msgstr ""
-#. cdt69
+#. KZbGT
#: 05070200.xhp
msgctxt ""
"05070200.xhp\n"
"par_id3144336\n"
"help.text"
-msgid "The vertical position of the selected objects is not affected by this command.<embedvar href=\"text/shared/01/05070100.xhp#mehrfachselektion\"/>"
-msgstr "此指令不會影響所選物件的垂直位置。<embedvar href=\"text/shared/01/05070100.xhp#mehrfachselektion\"/>"
+msgid "The vertical position of the selected objects is not affected by this command."
+msgstr ""
+
+#. yXXeh
+#: 05070200.xhp
+msgctxt ""
+"05070200.xhp\n"
+"par_id891634662083611\n"
+"help.text"
+msgid "To align the individual objects in a group, choose <menuitem>Format - Group - Enter Group</menuitem> to enter the group, select the objects, right-click, and then choose an alignment option."
+msgstr ""
+
+#. FyxcB
+#: 05070200.xhp
+msgctxt ""
+"05070200.xhp\n"
+"par_id81634662074262\n"
+"help.text"
+msgid "To align the individual objects in a group, double-click to enter the group, select the objects, right-click, and then choose an alignment option."
+msgstr ""
#. xtqWj
#: 05070300.xhp
@@ -25306,13 +25522,13 @@ msgctxt ""
msgid "<variable id=\"verbindentext\"><ahelp hid=\".\">Combines the contents of the selected cells into a single cell, retaining the formatting of the first cell in the selection.</ahelp></variable>"
msgstr ""
-#. ip2CD
+#. Cb2xp
#: 05100100.xhp
msgctxt ""
"05100100.xhp\n"
"par_id461632808376973\n"
"help.text"
-msgid "Click and drag to select the cells to be merged then do one of the following:"
+msgid "Select the cells to be merged then do one of the following:"
msgstr ""
#. bJGUQ
@@ -25324,13 +25540,13 @@ msgctxt ""
msgid "In the <emph>Formatting</emph> toolbar, click:"
msgstr ""
-#. R8GWz
+#. kBxWW
#: 05100100.xhp
msgctxt ""
"05100100.xhp\n"
"par_id3154351\n"
"help.text"
-msgid "Or, right click the selection to open the context menu and choose <menuitem>Merge Cells</menuitem>.<br/>If <menuitem>Unmerge Cells</menuitem> is present instead then the cell selection contains merged cells and cannot be merged further."
+msgid "Or, right click the selection to open the context menu and choose <menuitem>Merge Cells</menuitem>. If <menuitem>Unmerge Cells</menuitem> is present instead then the cell selection contains merged cells and cannot be merged further."
msgstr ""
#. Fz6u9
@@ -25342,13 +25558,13 @@ msgctxt ""
msgid "Or, in the <emph>Properties</emph> sidebar mark the <emph>Merge Cells</emph> checkbox."
msgstr ""
-#. fsBRE
+#. CmQFq
#: 05100100.xhp
msgctxt ""
"05100100.xhp\n"
"par_id3154020\n"
"help.text"
-msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Merge Cells</menuitem>."
+msgid "Or, choose <menuitem>Format - Merge and Unmerge Cells - Merge Cells</menuitem>."
msgstr ""
#. tHAGa
@@ -25378,13 +25594,13 @@ msgctxt ""
msgid "Split Cells"
msgstr "分割儲存格"
-#. njuVE
+#. i8VUj
#: 05100200.xhp
msgctxt ""
"05100200.xhp\n"
"bm_id501632012952361\n"
"help.text"
-msgid "<bookmark_value>unmerge/unmerging cells</bookmark_value> <bookmark_value>split/splitting cells</bookmark_value>"
+msgid "<bookmark_value>unmerge/unmerging cells</bookmark_value><bookmark_value>split/splitting cells</bookmark_value>"
msgstr ""
#. zDkKt
@@ -25396,13 +25612,13 @@ msgctxt ""
msgid "<variable id=\"unmergecells\"><link href=\"text/shared/01/05100200.xhp\" name=\"Unmerging Cells\">Unmerge Cells</link></variable>"
msgstr ""
-#. 3oTxu
+#. vXyfX
#: 05100200.xhp
msgctxt ""
"05100200.xhp\n"
"par_id871632385128307\n"
"help.text"
-msgid "<ahelp hid=\".\">Divides previously merged cells back to the original cells. If the original cells had content that was kept when merged that content is restored.</ahelp>"
+msgid "<ahelp hid=\".\">Divides previously merged cells back to the original cells. If the original cells had content that was kept when merged that content is restored.</ahelp>"
msgstr ""
#. qBugU
@@ -25423,13 +25639,13 @@ msgctxt ""
msgid "In the <emph>Formatting</emph> toolbar click:"
msgstr ""
-#. VvKDu
+#. SMhxF
#: 05100200.xhp
msgctxt ""
"05100200.xhp\n"
"par_id161632275254217\n"
"help.text"
-msgid "Or, right click the selection to open the context menu and choose <menuitem>Unmerge Cells</menuitem>.<br/>If <menuitem>Merge Cells</menuitem> is present instead then the cell selection does not contain any merged cells."
+msgid "Or, right click the selection to open the context menu and choose <menuitem>Unmerge Cells</menuitem>. If <menuitem>Merge Cells</menuitem> is present instead then the cell selection does not contain any merged cells."
msgstr ""
#. WLbsk
@@ -25441,13 +25657,13 @@ msgctxt ""
msgid "Or, in the <emph>Properties</emph> sidebar clear the <emph>Merge Cells</emph> checkbox."
msgstr ""
-#. BNuGm
+#. nnwCo
#: 05100200.xhp
msgctxt ""
"05100200.xhp\n"
"par_id381632805680565\n"
"help.text"
-msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Unmerge Cells</menuitem>"
+msgid "Or, choose <menuitem>Format - Merge and Unmerge Cells - Unmerge Cells</menuitem>"
msgstr ""
#. Tvbae
@@ -25468,22 +25684,22 @@ msgctxt ""
msgid "<variable id=\"teilentext\"><ahelp hid=\".\">Displays the Split Cells Dialog where the split can be defined as either horizontally or vertically and the number the each cell will be split into.</ahelp></variable>"
msgstr ""
-#. yAYPv
+#. aAHnr
#: 05100200.xhp
msgctxt ""
"05100200.xhp\n"
"par_id321632807186976\n"
"help.text"
-msgid "Do one of the following:<br/>"
+msgid "Do one of the following:"
msgstr ""
-#. KBJNC
+#. yzi5c
#: 05100200.xhp
msgctxt ""
"05100200.xhp\n"
"par_id3154024\n"
"help.text"
-msgid "Choose <emph>Table - Split Cells</emph>.<br/>"
+msgid "Choose <emph>Table - Split Cells</emph>."
msgstr ""
#. pNAsT
@@ -29401,14 +29617,14 @@ msgctxt ""
msgid "Position and Size (Text Box and Shape)"
msgstr ""
-#. rrFri
+#. tnQ2D
#: 05230100.xhp
msgctxt ""
"05230100.xhp\n"
"bm_id3154350\n"
"help.text"
-msgid "<bookmark_value>positioning;draw objects and controls</bookmark_value><bookmark_value>draw objects;positioning and resizing</bookmark_value><bookmark_value>controls; positions and sizes</bookmark_value><bookmark_value>sizes;draw objects</bookmark_value><bookmark_value>anchors;types/positions for draw objects</bookmark_value><bookmark_value>draw objects; anchoring</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>positioning;draw objects and controls</bookmark_value> <bookmark_value>draw objects;positioning and resizing</bookmark_value> <bookmark_value>controls; positions and sizes</bookmark_value> <bookmark_value>sizes;draw objects</bookmark_value> <bookmark_value>anchors;types/positions for draw objects</bookmark_value> <bookmark_value>draw objects; anchoring</bookmark_value>"
+msgstr ""
#. p36co
#: 05230100.xhp
@@ -29779,13 +29995,13 @@ msgctxt ""
msgid "<variable id=\"AdaptNote\">Adapt is only available for Text Boxes. To adapt Shapes to text, use</variable> <menuitem>Format - Object - Text</menuitem>."
msgstr ""
-#. fqg3X
+#. EARC7
#: 05230100.xhp
msgctxt ""
"05230100.xhp\n"
"par_id591602522244128\n"
"help.text"
-msgid "<embedvar href=\"text/shared/01/05230100.xhp#AdaptNote\"/> <menuitem>Format - Text</menuitem>."
+msgid "Adapt is only available for Text Boxes. To adapt Shapes to text, use <menuitem>Format - Text</menuitem>."
msgstr ""
#. F5Va7
@@ -36934,13 +37150,13 @@ msgctxt ""
msgid "To apply an AutoCorrect rule, enter the predefined text in the document and press the <widget>Spacebar</widget>."
msgstr ""
-#. 3vHeN
+#. rBtji
#: 06040000.xhp
msgctxt ""
"06040000.xhp\n"
"par_id791632159942582\n"
"help.text"
-msgid "To turn off AutoCorrect in %PRODUCTNAME Writer choose <menuitem>Tools - AutoCorrect - While Typing</menuitem>. Refer to the help page <embedvar href=\"text/swriter/guide/auto_off.xhp#auto_off\"/> to learn more about deactivating AutoCorrect in %PRODUCTNAME Writer."
+msgid "To turn off AutoCorrect in %PRODUCTNAME Writer choose <menuitem>Tools - AutoCorrect - While Typing</menuitem>. Refer to the help page <link href=\"text/swriter/guide/auto_off.xhp\" name=\"auto_off_link1\">Turning Off AutoCorrect</link> to learn more about deactivating AutoCorrect in %PRODUCTNAME Writer."
msgstr ""
#. rqivx
@@ -36952,13 +37168,13 @@ msgctxt ""
msgid "To apply AutoCorrect to an entire text document, choose <menuitem>Tools - AutoCorrect - Apply</menuitem>."
msgstr ""
-#. cqbQV
+#. 9cDF3
#: 06040000.xhp
msgctxt ""
"06040000.xhp\n"
"par_id911632159367467\n"
"help.text"
-msgid "To turn off AutoCorrect in %PRODUCTNAME Calc, go to <menuitem>Tools - AutoCorrect Options</menuitem> and uncheck all items in the <emph>Options</emph> and <emph>Localized Options</emph> tabs. Refer to the help page <embedvar href=\"text/scalc/guide/auto_off.xhp#auto_off\"/> to learn more about deactivating AutoCorrect in %PRODUCTNAME Calc."
+msgid "To turn off AutoCorrect in %PRODUCTNAME Calc, go to <menuitem>Tools - AutoCorrect Options</menuitem> and uncheck all items in the <emph>Options</emph> and <emph>Localized Options</emph> tabs. Refer to the help page <link href=\"text/swriter/guide/auto_off.xhp\" name=\"auto_off_link2\">Turning Off AutoCorrect</link> to learn more about deactivating AutoCorrect in %PRODUCTNAME Calc."
msgstr ""
#. EmB5a
diff --git a/source/zh-TW/helpcontent2/source/text/shared/explorer/database.po b/source/zh-TW/helpcontent2/source/text/shared/explorer/database.po
index ea55c2c0e05..d269ec4c3ed 100644
--- a/source/zh-TW/helpcontent2/source/text/shared/explorer/database.po
+++ b/source/zh-TW/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-10-04 19:51+0200\n"
+"POT-Creation-Date: 2021-10-25 12:49+0200\n"
"PO-Revision-Date: 2019-08-09 08:02+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,1473 +16,6 @@ msgstr ""
"X-Generator: LibreOffice\n"
"X-POOTLE-MTIME: 1565337770.000000\n"
-#. SJaiE
-#: dabawiz02.xhp
-msgctxt ""
-"dabawiz02.xhp\n"
-"tit\n"
-"help.text"
-msgid "Save and proceed"
-msgstr "儲存並繼續"
-
-#. azKWk
-#: dabawiz02.xhp
-msgctxt ""
-"dabawiz02.xhp\n"
-"par_idN10544\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02.xhp\">Save and proceed</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02.xhp\">儲存並繼續</link>"
-
-#. CECqo
-#: dabawiz02.xhp
-msgctxt ""
-"dabawiz02.xhp\n"
-"par_idN10554\n"
-"help.text"
-msgid "<ahelp hid=\".\">Specifies whether you want to register the database, open the database for editing, or insert a new table.</ahelp>"
-msgstr "<ahelp hid=\".\">指定您是否要註冊資料庫、開啟資料庫進行編輯,或是插入新的表格。</ahelp>"
-
-#. v3hCS
-#: dabawiz02.xhp
-msgctxt ""
-"dabawiz02.xhp\n"
-"par_idN10557\n"
-"help.text"
-msgid "Yes, register the Database for me"
-msgstr "是的,請為我註冊資料庫"
-
-#. 6iEY2
-#: dabawiz02.xhp
-msgctxt ""
-"dabawiz02.xhp\n"
-"par_idN105B4\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select to register the database within your user copy of %PRODUCTNAME. After registering, the database is displayed in the <emph>View - Data Sources</emph> window. You must register a database to be able to insert the database fields in a document (Insert - Field - More Fields) or in a mail merge.</ahelp>"
-msgstr "<ahelp hid=\".\">選取此選項可在您的 %PRODUCTNAME 使用者副本內註冊資料庫。註冊完畢後,該資料庫會顯示在 <emph>[檢視] - [資料來源]</emph> 視窗中。您必須註冊資料庫,才可將資料庫欄位插入文件 ([插入] - [欄位] - [其他]) 或合併列印中。</ahelp>"
-
-#. BDPbo
-#: dabawiz02.xhp
-msgctxt ""
-"dabawiz02.xhp\n"
-"par_idN105B7\n"
-"help.text"
-msgid "No, do not register the database"
-msgstr "不,我會註冊此資料庫"
-
-#. PHFCG
-#: dabawiz02.xhp
-msgctxt ""
-"dabawiz02.xhp\n"
-"par_idN105BB\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select to keep the database information only within the created database file.</ahelp>"
-msgstr "<ahelp hid=\".\">選取此選項可使資料庫資訊只保持在所建立的資料庫文件內。</ahelp>"
-
-#. xJFV8
-#: dabawiz02.xhp
-msgctxt ""
-"dabawiz02.xhp\n"
-"par_idN1055B\n"
-"help.text"
-msgid "Open the database for editing"
-msgstr "開啟資料庫進行編輯"
-
-#. 2oDVV
-#: dabawiz02.xhp
-msgctxt ""
-"dabawiz02.xhp\n"
-"par_idN105C6\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select to display the database file, where you can edit the database structure.</ahelp>"
-msgstr "<ahelp hid=\".\">選取此選項可顯示資料庫文件視窗,您可在其中編輯資料庫結構。</ahelp>"
-
-#. uUaJe
-#: dabawiz02.xhp
-msgctxt ""
-"dabawiz02.xhp\n"
-"par_idN1055F\n"
-"help.text"
-msgid "Create tables using the table wizard"
-msgstr "透過表格精靈建立表格"
-
-#. F4TTD
-#: dabawiz02.xhp
-msgctxt ""
-"dabawiz02.xhp\n"
-"par_idN105D1\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select to call the <link href=\"text/shared/explorer/database/tablewizard00.xhp\">Table Wizard</link> after the Database Wizard is finished.</ahelp>"
-msgstr "<ahelp hid=\".\">選取此選項可在結束「資料庫精靈」後呼叫<link href=\"text/shared/explorer/database/tablewizard00.xhp\">表格精靈</link>。</ahelp>"
-
-#. YnZ24
-#: dabawiz02access.xhp
-msgctxt ""
-"dabawiz02access.xhp\n"
-"tit\n"
-"help.text"
-msgid "Microsoft Access Connection"
-msgstr "Microsoft Access 連接"
-
-#. uUAxL
-#: dabawiz02access.xhp
-msgctxt ""
-"dabawiz02access.xhp\n"
-"bm_id2755516\n"
-"help.text"
-msgid "<bookmark_value>Access databases (base)</bookmark_value><bookmark_value>Microsoft Office;Access databases (base)</bookmark_value>"
-msgstr "<bookmark_value>Access 資料庫 (Base)</bookmark_value><bookmark_value>Microsoft Office; Access 資料庫 (Base)</bookmark_value>"
-
-#. unEfj
-#: dabawiz02access.xhp
-msgctxt ""
-"dabawiz02access.xhp\n"
-"par_idN1053D\n"
-"help.text"
-msgid "<variable id=\"access\"><link href=\"text/shared/explorer/database/dabawiz02access.xhp\">Microsoft Access Connection</link></variable>"
-msgstr "<variable id=\"access\"><link href=\"text/shared/explorer/database/dabawiz02access.xhp\">Microsoft Access 連線</link></variable>"
-
-#. eMbAE
-#: dabawiz02access.xhp
-msgctxt ""
-"dabawiz02access.xhp\n"
-"par_idN10541\n"
-"help.text"
-msgid "<ahelp hid=\".\">Specifies the settings for importing a database file in Microsoft Access or Access 2007 format.</ahelp>"
-msgstr "<ahelp hid=\".\">指定以 Microsoft Access 或 Access 2007 格式匯入資料庫檔案的設定。</ahelp>"
-
-#. FJFQi
-#: dabawiz02access.xhp
-msgctxt ""
-"dabawiz02access.xhp\n"
-"par_id1142772\n"
-"help.text"
-msgid "See also the English Wiki page <link href=\"https://wiki.documentfoundation.org/MSA-Base_Faq\" name=\"wiki.documentfoundation.org MS Access Base FAQ\">https://wiki.documentfoundation.org/MSA-Base_Faq</link>."
-msgstr ""
-
-#. 7vvBT
-#: dabawiz02access.xhp
-msgctxt ""
-"dabawiz02access.xhp\n"
-"par_idN10544\n"
-"help.text"
-msgid "Microsoft Access database file"
-msgstr "Microsoft Access 資料庫檔案"
-
-#. 5nSHE
-#: dabawiz02access.xhp
-msgctxt ""
-"dabawiz02access.xhp\n"
-"par_idN10548\n"
-"help.text"
-msgid "<ahelp hid=\".\">Specifies the path to the database file.</ahelp>"
-msgstr "<ahelp hid=\".\">指定資料庫檔案的路徑。</ahelp>"
-
-#. cKU7v
-#: dabawiz02access.xhp
-msgctxt ""
-"dabawiz02access.xhp\n"
-"par_idN1054B\n"
-"help.text"
-msgid "Browse"
-msgstr "瀏覽"
-
-#. k4EM5
-#: dabawiz02access.xhp
-msgctxt ""
-"dabawiz02access.xhp\n"
-"par_idN1054F\n"
-"help.text"
-msgid "<ahelp hid=\".\">Click to open a file selection dialog.</ahelp>"
-msgstr "<ahelp hid=\".\">按一下此選項開啟一個檔案選擇對話方塊。</ahelp>"
-
-#. gjtnv
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"tit\n"
-"help.text"
-msgid "ADO Connection"
-msgstr "ADO 連接"
-
-#. jJtjy
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"bm_id7565233\n"
-"help.text"
-msgid "<bookmark_value>ADO databases (Base)</bookmark_value><bookmark_value>MS ADO interface (Base)</bookmark_value><bookmark_value>databases;ADO (Base)</bookmark_value>"
-msgstr "<bookmark_value>ADO 資料庫 (Base)</bookmark_value><bookmark_value>MS ADO 介面 (Base)</bookmark_value><bookmark_value>資料庫; ADO (Base)</bookmark_value>"
-
-#. yRyA5
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN1054C\n"
-"help.text"
-msgid "<variable id=\"ado\"><link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">ADO Connection</link></variable>"
-msgstr "<variable id=\"ado\"><link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">ADO 連線</link></variable>"
-
-#. Gi6xc
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN10550\n"
-"help.text"
-msgid "<ahelp hid=\".\">Specifies the options for adding an ADO (Microsoft ActiveX Data Objects) database.</ahelp>"
-msgstr "<ahelp hid=\".\">指定用於增加 ADO (Microsoft ActiveX 資料物件) 資料庫的選項。</ahelp>"
-
-#. pGwdA
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN10565\n"
-"help.text"
-msgid "The ADO interface is a Microsoft Windows proprietary container for connecting to databases."
-msgstr "ADO 介面是 Microsoft Windows 用於連接資料庫的專屬容器。"
-
-#. mVEj7
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN10568\n"
-"help.text"
-msgid "$[officename] requires the Microsoft Data Access Components (MDAC) to use the ADO interface. Microsoft Windows 2000 and XP include these components by default."
-msgstr ""
-
-#. CWQxx
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN1056B\n"
-"help.text"
-msgid "Data source URL"
-msgstr "資料來源 URL"
-
-#. dEHxg
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN1056F\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter the data source URL.</ahelp>"
-msgstr "<ahelp hid=\".\">輸入資料來源 URL。</ahelp>"
-
-#. AS8Ye
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN10572\n"
-"help.text"
-msgid "Example URLs"
-msgstr "URL 範例"
-
-#. DGA9a
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN10576\n"
-"help.text"
-msgid "To connect to an Access 2000 file, use the format:"
-msgstr "若要連結到 Access 2000 檔案,請使用格式:"
-
-#. EYrtv
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN10579\n"
-"help.text"
-msgid "PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=c:\\Access\\nwind2000.mdb"
-msgstr "PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=c:\\Access\\nwind2000.mdb"
-
-#. JrQva
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN1057C\n"
-"help.text"
-msgid "To connect with a name to a catalog on a Microsoft SQL server that has a name turner, enter:"
-msgstr "若要使用名稱連結到名為 turner 的 Microsoft SQL 伺服器上的目錄,請輸入:"
-
-#. HeHcf
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN1057F\n"
-"help.text"
-msgid "PROVIDER=sqloledb;DATA SOURCE=turner;INITIAL CATALOG=First"
-msgstr "PROVIDER=sqloledb;DATA SOURCE=turner;INITIAL CATALOG=First"
-
-#. eqFwU
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN10582\n"
-"help.text"
-msgid "To access an ODBC driver as a provider:"
-msgstr "若要以提供者的身份存取 ODBC 驅動程式,請:"
-
-#. cibKq
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN10585\n"
-"help.text"
-msgid "DSN=SQLSERVER"
-msgstr "DSN=SQLSERVER"
-
-#. FFdf5
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN10588\n"
-"help.text"
-msgid "Browse"
-msgstr "瀏覽"
-
-#. xmZQB
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN1058C\n"
-"help.text"
-msgid "<ahelp hid=\".\">Click to open a database selection dialog.</ahelp>"
-msgstr "<ahelp hid=\".\">按一下此選項開啟一個檔案選擇對話方塊。</ahelp>"
-
-#. Bi3az
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN10596\n"
-"help.text"
-msgid "A user name can have a maximum of 18 characters."
-msgstr ""
-
-#. iifVJ
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN10599\n"
-"help.text"
-msgid "A password must contain 3 to 18 characters."
-msgstr ""
-
-#. mxSCU
-#: dabawiz02dbase.xhp
-msgctxt ""
-"dabawiz02dbase.xhp\n"
-"tit\n"
-"help.text"
-msgid "dBASE Connection"
-msgstr "dBASE 連線"
-
-#. tp8Cf
-#: dabawiz02dbase.xhp
-msgctxt ""
-"dabawiz02dbase.xhp\n"
-"par_idN1054A\n"
-"help.text"
-msgid "<variable id=\"dbase\"><link href=\"text/shared/explorer/database/dabawiz02dbase.xhp\">dBASE Connection</link></variable>"
-msgstr "<variable id=\"dbase\"><link href=\"text/shared/explorer/database/dabawiz02dbase.xhp\">dBASE 連線</link></variable>"
-
-#. 3rzAr
-#: dabawiz02dbase.xhp
-msgctxt ""
-"dabawiz02dbase.xhp\n"
-"par_idN10556\n"
-"help.text"
-msgid "Path to the dBASE files"
-msgstr "dBASE 檔案的路徑"
-
-#. 9qfqi
-#: dabawiz02dbase.xhp
-msgctxt ""
-"dabawiz02dbase.xhp\n"
-"par_idN1055A\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter the path to the dBASE *.dbf files.</ahelp>"
-msgstr "<ahelp hid=\".\">輸入 dBASE *.dbf 檔案的路徑。</ahelp>"
-
-#. JtErQ
-#: dabawiz02dbase.xhp
-msgctxt ""
-"dabawiz02dbase.xhp\n"
-"par_idN10571\n"
-"help.text"
-msgid "Browse"
-msgstr "瀏覽"
-
-#. VHbhH
-#: dabawiz02dbase.xhp
-msgctxt ""
-"dabawiz02dbase.xhp\n"
-"par_idN10575\n"
-"help.text"
-msgid "<ahelp hid=\".\">Open a path selection dialog.</ahelp>"
-msgstr "<ahelp hid=\".\">開啟路徑選取對話方塊。</ahelp>"
-
-#. n9AxK
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"tit\n"
-"help.text"
-msgid "JDBC Connection"
-msgstr "JDBC 連接"
-
-#. BSPeu
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"bm_id3726920\n"
-"help.text"
-msgid "<bookmark_value>JDBC; databases (Base)</bookmark_value><bookmark_value>databases; JDBC (Base)</bookmark_value>"
-msgstr "<bookmark_value>JDBC; 資料庫 (Base)</bookmark_value><bookmark_value>資料庫; JDBC (Base)</bookmark_value>"
-
-#. DE8Po
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN105FC\n"
-"help.text"
-msgid "<variable id=\"jdbc\"><link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">JDBC Connection</link></variable>"
-msgstr "<variable id=\"jdbc\"><link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">JDBC 連線</link></variable>"
-
-#. 4vvDv
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN10600\n"
-"help.text"
-msgid "<ahelp hid=\".\">Specifies the options to access a <link href=\"text/shared/00/00000005.xhp#jdbc\" name=\"JDBC\">JDBC</link> database.</ahelp>"
-msgstr "<ahelp hid=\".\">指定存取 <link href=\"text/shared/00/00000005.xhp#jdbc\" name=\"JDBC\">JDBC</link> 資料庫的選項。</ahelp>"
-
-#. MAM5R
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN10623\n"
-"help.text"
-msgid "JDBC Examples"
-msgstr "JDBC 範例"
-
-#. FAkVF
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN10627\n"
-"help.text"
-msgid "<item type=\"productname\">You can use a JDBC driver class to connect to a JDBC database from %PRODUCTNAME</item>. The driver class is provided by the database manufacturer. Two examples of JDBC databases are Oracle and MySQL."
-msgstr "<item type=\"productname\">可使用 JDBC 驅動程式類別與 %PRODUCTNAME 內的 JDBC 資料庫連接</item>。驅動程式類別由資料庫製造商提供。Oracle 和 MySQL 即為 JDBC 資料庫的兩個範例。"
-
-#. ehUZi
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN1062D\n"
-"help.text"
-msgid "The driver classes must be added to %PRODUCTNAME in <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - Advanced</menuitem>."
-msgstr ""
-
-#. KTrhC
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN10634\n"
-"help.text"
-msgid "Oracle database"
-msgstr "Oracle 資料庫"
-
-#. Br2JC
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN10638\n"
-"help.text"
-msgid "You can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver."
-msgstr "可使用 JDBC 驅動程式存取 Solaris 或 Linux 中的 Oracle 資料庫。若要存取 Windows 內的資料庫,必須使用 ODBC 驅動程式。"
-
-#. pei94
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN1064B\n"
-"help.text"
-msgid "On UNIX, ensure that the Oracle database client is installed with JDBC support. The JDBC driver class for the Solaris Oracle client version 8.x is located in the <Oracle client>/product/jdbc/lib/classes111.zip directory. You can also download the latest version from the Oracle web site."
-msgstr ""
-
-#. DifQh
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN10661\n"
-"help.text"
-msgid "In the <emph>Data source URL</emph> box, enter the location of the Oracle database server. The syntax of the URL depends on the database type. See the documentation that came with the JDBC driver for more information."
-msgstr "在 <emph>[資料來源 URL]</emph> 方塊中,輸入 Oracle 資料庫伺服器的位置。該 URL 的語法取決於資料庫的類型。請參閱 JDBC 驅動程式隨附的文件,以取得更多資訊。"
-
-#. BBFrJ
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN10668\n"
-"help.text"
-msgid "For an Oracle database, the syntax of the URL is:"
-msgstr "對於 Oracle 資料庫,URL 的語法是:"
-
-#. 7tbob
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN1066B\n"
-"help.text"
-msgid "oracle:thin:@hostname:port:database_name"
-msgstr "oracle:thin:@hostname:port:database_name"
-
-#. RiDDR
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN10674\n"
-"help.text"
-msgid "hostname is the name of the machine that runs the Oracle database. You can also replace hostname with the IP address of the server."
-msgstr "hostname 是指執行 Oracle 資料庫的機器名稱。您也可以用該伺服器的 IP 位址替代主機名稱。"
-
-#. sFfhQ
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN10678\n"
-"help.text"
-msgid "port is the port where the Oracle database listens. Ask your database administrator for the correct port address."
-msgstr "port 是指 Oracle 資料庫所偵聽的連接埠。請向您的資料庫管理員詢問正確的連接埠位址。"
-
-#. GDkVv
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN1067C\n"
-"help.text"
-msgid "database_name is the name of the Oracle database. Ask your database administrator for the correct name."
-msgstr "database_name 是指 Oracle 資料庫的名稱。請向您的資料庫管理員詢問正確的名稱。"
-
-#. aQiqR
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN1067F\n"
-"help.text"
-msgid "MySQL database"
-msgstr "MySQL 資料庫"
-
-#. FEV5u
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN10683\n"
-"help.text"
-msgid "The driver for the MySQL database is available on the MySQL web site."
-msgstr "MySQL 網站上提供 MySQL 資料庫的驅動程式。"
-
-#. p2v67
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN10689\n"
-"help.text"
-msgid "The syntax for a MySQL database is:"
-msgstr "MySQL 資料庫的語法是:"
-
-#. wEDsL
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN1068C\n"
-"help.text"
-msgid "mysql://hostname:port/database_name"
-msgstr "mysql://hostname:port/database_name"
-
-#. m5Kcx
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN10695\n"
-"help.text"
-msgid "<ahelp hid=\".\">hostname is the name of the machine that runs the MySQL database.</ahelp> You can also replace hostname with the IP address of the server."
-msgstr "<ahelp hid=\".\">hostname 是指執行 MySQL 資料庫的機器名稱。</ahelp>您也可以用該伺服器的 IP 位址替代主機名稱。"
-
-#. LCpew
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN10699\n"
-"help.text"
-msgid "port is the default port for MySQL databases, namely 3306."
-msgstr "port 是指 MySQL 資料庫的預設連接埠,即 3306。"
-
-#. q2DuM
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN1069D\n"
-"help.text"
-msgid "database_name is the name of the database."
-msgstr "database_name 是指資料庫的名稱。"
-
-#. YYgSg
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN106A0\n"
-"help.text"
-msgid "Data source URL"
-msgstr "資料來源 URL"
-
-#. EcdaK
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN106A4\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter the URL for the database. For example, for the MySQL JDBC driver, enter \"mysql://<Servername>/<name of the database>\". For more information on the JDBC driver, consult the documentation that came with the driver.</ahelp>"
-msgstr ""
-
-#. eVBSr
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN106BB\n"
-"help.text"
-msgid "JDBC Driver Class"
-msgstr "JDBC 驅動程式類別"
-
-#. vFsoP
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN106BF\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter the name of the JDBC driver.</ahelp>"
-msgstr ""
-
-#. VHjhA
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_id7953733\n"
-"help.text"
-msgid "Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - Advanced</menuitem>, and click the <widget>Class Path</widget> button. After you add the path information, restart %PRODUCTNAME."
-msgstr ""
-
-#. f8fUr
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN106CE\n"
-"help.text"
-msgid "Test Class"
-msgstr "測試類別"
-
-#. 8VBbq
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN106E4\n"
-"help.text"
-msgid "<ahelp hid=\".\">Tests the connection with the current settings.</ahelp>"
-msgstr "<ahelp hid=\".\">使用目前的設定測試連接。</ahelp>"
-
-#. FGezr
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN106E7\n"
-"help.text"
-msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
-msgstr ""
-
-#. Y4EFA
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"tit\n"
-"help.text"
-msgid "MariaDB and MySQL Connection"
-msgstr ""
-
-#. bVNAZ
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"bm_id861587404584956\n"
-"help.text"
-msgid "<bookmark_value>MariaDB settings (Base)</bookmark_value><bookmark_value>MySQL settings (Base)</bookmark_value>"
-msgstr ""
-
-#. f4CzF
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_idN10549\n"
-"help.text"
-msgid "<variable id=\"mysql\"><link href=\"text/shared/explorer/database/dabawiz02mysql.xhp\">MariaDB and MySQL Connection</link></variable>"
-msgstr ""
-
-#. 5FPU6
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_idN1054D\n"
-"help.text"
-msgid "<ahelp hid=\".\">Specifies the options for MariaDB and MySQL databases.</ahelp>"
-msgstr ""
-
-#. Bmcwo
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"hd_id661587405298284\n"
-"help.text"
-msgid "Direct Connection for MariaDB and MySQL databases"
-msgstr ""
-
-#. vd9VD
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"hd_id321587405303769\n"
-"help.text"
-msgid "Database name"
-msgstr ""
-
-#. 6LAsi
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_id371587405314376\n"
-"help.text"
-msgid "Enter the name of the MariaDB or MySQL database. Ask your database administrator for the correct name."
-msgstr ""
-
-#. jbdZp
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"hd_id561587405334695\n"
-"help.text"
-msgid "Server URL"
-msgstr ""
-
-#. SshYk
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_id521587405341138\n"
-"help.text"
-msgid "Enter the URL for the database server. This is the name of the machine that runs the MariaDB or MySQL database. You can also replace hostname with the IP address of the server."
-msgstr ""
-
-#. MZQiq
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"hd_id171587405349438\n"
-"help.text"
-msgid "Port number"
-msgstr ""
-
-#. J2SR3
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_id1001587405358390\n"
-"help.text"
-msgid "Enter the port number for the database server. Ask your database administrator for the correct port address. The default port number for MySQL or MariaDB databases is 3306."
-msgstr ""
-
-#. ovKhU
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"hd_id121587407845730\n"
-"help.text"
-msgid "Named Pipe"
-msgstr ""
-
-#. Rq89B
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_id941587407987180\n"
-"help.text"
-msgid "If the MariaDB or MySQL database is to be accessed by a named pipe, enter its name."
-msgstr ""
-
-#. wF6bj
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"hd_id161587405553671\n"
-"help.text"
-msgid "Socket"
-msgstr ""
-
-#. e8DB2
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_id161587405561472\n"
-"help.text"
-msgid "If the MariaDB or MySQL database is to be accessed by a socket, enter the socket ID."
-msgstr ""
-
-#. fpBNu
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_idN10562\n"
-"help.text"
-msgid "Connect using ODBC (Open Database Connectivity)"
-msgstr "透過 ODBC (開放式資料庫連結) 連結"
-
-#. E7sE2
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_idN10566\n"
-"help.text"
-msgid "<ahelp hid=\".\">Connects to an existing ODBC data source that was set on a system level.</ahelp>"
-msgstr "<ahelp hid=\".\">連結至在系統級上設定的現有 ODBC 資料源。</ahelp>"
-
-#. AXrwJ
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_idN10569\n"
-"help.text"
-msgid "Connect using JDBC (Java Database Connectivity)"
-msgstr "透過 JDBC (Java 資料庫連結) 連結"
-
-#. i9TrE
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_idN1056D\n"
-"help.text"
-msgid "<ahelp hid=\".\">Connects to an existing JDBC data source that was set on a system level.</ahelp>"
-msgstr "<ahelp hid=\".\">連結至在系統級上設定的現有 JDBC 資料源。</ahelp>"
-
-#. FUG3D
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_idN10570\n"
-"help.text"
-msgid "The next wizard page depends on your choice of ODBC or JDBC:"
-msgstr "下一精靈頁面將視您選擇的是 ODBC 還是 JDBC 而有所不同:"
-
-#. aCA6C
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_idN10573\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC Connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC 連接</link>"
-
-#. BkeDx
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_idN10582\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">JDBC Connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">JDBC 連接</link>"
-
-#. ujaGF
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_idN10591\n"
-"help.text"
-msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
-msgstr ""
-
-#. HF588
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"tit\n"
-"help.text"
-msgid "ODBC Connection"
-msgstr "ODBC 連接"
-
-#. sGNau
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"bm_id3149031\n"
-"help.text"
-msgid "<bookmark_value>ODBC;database (Base)</bookmark_value><bookmark_value>databases;ODBC (Base)</bookmark_value>"
-msgstr "<bookmark_value>ODBC; 資料庫 (Base)</bookmark_value><bookmark_value>資料庫; ODBC (Base)</bookmark_value>"
-
-#. iFxfY
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_idN1053D\n"
-"help.text"
-msgid "<variable id=\"odbc\"><link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC Connection</link></variable>"
-msgstr "<variable id=\"odbc\"><link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC 連線</link></variable>"
-
-#. nb3Qq
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_idN10541\n"
-"help.text"
-msgid "<ahelp hid=\".\">Specifies the settings for <link href=\"text/shared/00/00000005.xhp#odbc\" name=\"ODBC\">ODBC</link> databases.</ahelp>"
-msgstr "<ahelp hid=\".\">指定用於 <link href=\"text/shared/00/00000005.xhp#odbc\" name=\"ODBC\">ODBC</link> 資料庫的設定。</ahelp>"
-
-#. WhLBW
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_id8856776\n"
-"help.text"
-msgid "To edit or add records to a database table in $[officename], the table must have a unique index field."
-msgstr "若要對 $[officename] 中的資料庫表格進行編輯或增加條目,則表格必須具有唯一的索引欄位。"
-
-#. xs2Yc
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_id8034302\n"
-"help.text"
-msgid "On Solaris and Linux platforms, try to use a JDBC driver instead of an ODBC driver. See http://www.unixodbc.org for an ODBC implementation on Solaris or Linux."
-msgstr "在 Solaris 與 Linux 平台上,請嘗試使用 JDBC 驅動程式,而不要使用 ODBC 驅動程式。如需 Solaris 或 Linux 的 ODBC 實作方式,請參閱 http://www.unixodbc.org。"
-
-#. PxZ9T
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_id8560136\n"
-"help.text"
-msgid "To connect to a Microsoft Access database on Windows, use the ADO or Access database interface, rather than ODBC."
-msgstr "若要在 Windows 上連線至 Microsoft Access 資料庫,請使用 ADO 或 Access 資料庫介面,而非 ODBC。"
-
-#. vme6U
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_id2082583\n"
-"help.text"
-msgid "Drivers for ODBC are supplied and supported by the manufacturer of the database. $[officename] only supports the ODBC 3 standard."
-msgstr "資料庫製造商會提供並支援 ODBC 驅動程式。$[officename] 僅支援 ODBC 3 標準。"
-
-#. wCexE
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_idN10552\n"
-"help.text"
-msgid "Name of the ODBC database"
-msgstr "ODBC 資料庫的名稱"
-
-#. eubaF
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_idN10556\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter the path to the database file.</ahelp>"
-msgstr "<ahelp hid=\".\">輸入資料庫檔案的路徑。</ahelp>"
-
-#. 7KKFy
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_idN10559\n"
-"help.text"
-msgid "Browse"
-msgstr "瀏覽"
-
-#. CSCAZ
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_idN1055D\n"
-"help.text"
-msgid "<ahelp hid=\".\">Click to open an ODBC data source selection dialog:</ahelp>"
-msgstr "<ahelp hid=\".\">按一下此選項可開啟選擇 ODBC 資料來源對話方塊:</ahelp>"
-
-#. 48ubg
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_idN10560\n"
-"help.text"
-msgid "Choose a data source"
-msgstr "選擇資料來源"
-
-#. FhAAU
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_idN10564\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select a data source to which you want to connect using ODBC. Then click <emph>OK</emph>.</ahelp>"
-msgstr "<ahelp hid=\".\">選取您欲使用 ODBC 連接至哪個資料來源。然後按一下 <emph>[確定]</emph>。</ahelp>"
-
-#. WaAZB
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_idN10567\n"
-"help.text"
-msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
-msgstr ""
-
-#. RL7sk
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"tit\n"
-"help.text"
-msgid "Oracle Database Connection"
-msgstr "Oracle 資料庫連接"
-
-#. 8H3zh
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"bm_id5900753\n"
-"help.text"
-msgid "<bookmark_value>Oracle databases (base)</bookmark_value>"
-msgstr "<bookmark_value>Oracle 資料庫 (Base)</bookmark_value>"
-
-#. W6aaT
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN105A4\n"
-"help.text"
-msgid "Oracle Database Connection"
-msgstr "Oracle 資料庫連接"
-
-#. DbqoE
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN105A8\n"
-"help.text"
-msgid "<ahelp hid=\".\">Specifies the options to access an Oracle database.</ahelp>"
-msgstr "<ahelp hid=\".\">指定存取 Oracle 資料庫的選項。</ahelp>"
-
-#. FMq7o
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN105BD\n"
-"help.text"
-msgid "Oracle database"
-msgstr "Oracle 資料庫"
-
-#. 8qHyA
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN105C1\n"
-"help.text"
-msgid "You can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver."
-msgstr "可使用 JDBC 驅動程式存取 Solaris 或 Linux 中的 Oracle 資料庫。若要存取 Windows 內的資料庫,必須使用 ODBC 驅動程式。"
-
-#. sSDYq
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN105D4\n"
-"help.text"
-msgid "On UNIX, ensure that the Oracle database client is installed with JDBC support. The JDBC driver class for the Solaris Oracle client version 8.x is located in the <Oracle client>/product/jdbc/lib/classes111.zip directory. You can also download the latest version of the driver from the Oracle web site."
-msgstr "在 UNIX 上,確保安裝 Oracle 資料庫用戶端時附帶安裝 JDBC 支援。Solaris Oracle 用戶端 8.x 版的 JDBC 驅動程式類別安裝於 <Oracle client>/product/jdbc/lib/classes111.zip 目錄下。您也可以從 Oracle 網站下載最新的驅動程式版本:"
-
-#. 5rxmX
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN10608\n"
-"help.text"
-msgid "Name of the Oracle database"
-msgstr "Oracle 資料庫的名稱"
-
-#. DxYWQ
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN1060C\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter the name of the Oracle database. Ask your database administrator for the correct name.</ahelp>"
-msgstr ""
-
-#. WKBSR
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN1060F\n"
-"help.text"
-msgid "Server URL"
-msgstr "伺服器 URL"
-
-#. vXDGs
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN10613\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter the URL for the database server. This is the name of the machine that runs the Oracle database. You can also replace hostname with the IP address of the server.</ahelp>"
-msgstr ""
-
-#. EEESV
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN10616\n"
-"help.text"
-msgid "Port number"
-msgstr "連接埠號碼"
-
-#. PBuEW
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN1061A\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter the port number for the database server. Ask your database administrator for the correct port address.</ahelp>"
-msgstr ""
-
-#. rYRxW
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN1061D\n"
-"help.text"
-msgid "Oracle JDBC Driver Class"
-msgstr "Oracle JDBC 驅動程式類別"
-
-#. ouDxa
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN10621\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter the name of the JDBC driver.</ahelp>"
-msgstr ""
-
-#. JumUz
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN10630\n"
-"help.text"
-msgid "Test Class"
-msgstr "測試類別"
-
-#. NdF7k
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN10634\n"
-"help.text"
-msgid "<ahelp hid=\".\">Tests the connection with the current settings.</ahelp>"
-msgstr "<ahelp hid=\".\">使用目前的設定測試連接。</ahelp>"
-
-#. UwteE
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN10637\n"
-"help.text"
-msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
-msgstr ""
-
-#. XoiBM
-#: dabawiz02spreadsheet.xhp
-msgctxt ""
-"dabawiz02spreadsheet.xhp\n"
-"tit\n"
-"help.text"
-msgid "Spreadsheet Database Connection"
-msgstr "試算表資料庫連接"
-
-#. cwGbM
-#: dabawiz02spreadsheet.xhp
-msgctxt ""
-"dabawiz02spreadsheet.xhp\n"
-"par_idN1053A\n"
-"help.text"
-msgid "Set up Spreadsheet connection"
-msgstr ""
-
-#. fZnvG
-#: dabawiz02spreadsheet.xhp
-msgctxt ""
-"dabawiz02spreadsheet.xhp\n"
-"par_idN1053E\n"
-"help.text"
-msgid "Location and file name"
-msgstr "位置與檔案名稱"
-
-#. 6TKT4
-#: dabawiz02spreadsheet.xhp
-msgctxt ""
-"dabawiz02spreadsheet.xhp\n"
-"par_idN10542\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter the path and file name to the spreadsheet file.</ahelp>"
-msgstr "<ahelp hid=\".\">輸入該試算表檔案的路徑和檔案名稱。</ahelp>"
-
-#. XtNjY
-#: dabawiz02spreadsheet.xhp
-msgctxt ""
-"dabawiz02spreadsheet.xhp\n"
-"par_idN10545\n"
-"help.text"
-msgid "Browse"
-msgstr "瀏覽"
-
-#. JfUMC
-#: dabawiz02spreadsheet.xhp
-msgctxt ""
-"dabawiz02spreadsheet.xhp\n"
-"par_idN10549\n"
-"help.text"
-msgid "<ahelp hid=\".\">Click to open a file selection dialog.</ahelp>"
-msgstr "<ahelp hid=\".\">按一下此選項開啟一個檔案選擇對話方塊。</ahelp>"
-
-#. JAmAi
-#: dabawiz02spreadsheet.xhp
-msgctxt ""
-"dabawiz02spreadsheet.xhp\n"
-"par_idN1054C\n"
-"help.text"
-msgid "Password required"
-msgstr "需要密碼"
-
-#. 3HzmH
-#: dabawiz02spreadsheet.xhp
-msgctxt ""
-"dabawiz02spreadsheet.xhp\n"
-"par_idN10550\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select to request a password from the user of the database document.</ahelp>"
-msgstr "<ahelp hid=\".\">選取此選項可向資料庫文件的使用者請求密碼。</ahelp>"
-
-#. xngE4
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"tit\n"
-"help.text"
-msgid "Text File Connection"
-msgstr "文字檔連接"
-
-#. dfWU7
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"bm_id2517166\n"
-"help.text"
-msgid "<bookmark_value>tables in databases;importing text formats (Base)</bookmark_value><bookmark_value>text databases (Base)</bookmark_value>"
-msgstr "<bookmark_value>資料庫中的表格; 匯入文字格式 (Base)</bookmark_value><bookmark_value>文字資料庫 (Base)</bookmark_value>"
-
-#. htUUB
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN1054F\n"
-"help.text"
-msgid "Set up a connection to text files"
-msgstr ""
-
-#. MD2eT
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN10553\n"
-"help.text"
-msgid "<ahelp hid=\".\">Specifies the settings for importing a database in text format.</ahelp>"
-msgstr "<ahelp hid=\".\">指定用於匯入文字格式的資料庫的設定。</ahelp>"
-
-#. 6yKNw
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN10568\n"
-"help.text"
-msgid "In a text format database, data is stored in an unformatted ASCII file, where each record comprises a row. The data fields are divided by separators. Text in the data fields is divided by quotation marks."
-msgstr "在文字格式的資料庫中,資料儲存在未格式化的 ASCII 檔案中,其中每個記錄構成一列。資料欄位以分隔符分隔。資料欄位內的文字以引號分隔。"
-
-#. puYrF
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN1056B\n"
-"help.text"
-msgid "Path to text files"
-msgstr "文字檔案的路徑"
-
-#. LkFcD
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN1056F\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter the path to the text file or files. If you just want one text file, you can use any extension of the file name. If you enter a folder name, the text files in that folder must have the extension *.csv to be recognized as files of the text database.</ahelp>"
-msgstr "<ahelp hid=\".\">輸入一或多個文字檔案的路徑。如果您只需要一個文字檔案,可使用檔名的任一副檔名。如果您輸入資料夾名稱,該資料夾內的文字檔案必須具有副檔名 *.csv 才會被識別為文字資料庫的檔案。</ahelp>"
-
-#. DwHAY
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN10572\n"
-"help.text"
-msgid "Browse"
-msgstr "瀏覽"
-
-#. tU8mG
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN10576\n"
-"help.text"
-msgid "<ahelp hid=\".\">Click to open a file selection dialog.</ahelp>"
-msgstr "<ahelp hid=\".\">按一下此選項開啟一個檔案選擇對話方塊。</ahelp>"
-
-#. MmGr4
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN10616\n"
-"help.text"
-msgid "Plain text files (*.txt)"
-msgstr "純文字檔案 (*.txt)"
-
-#. ztjWn
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN1061A\n"
-"help.text"
-msgid "<ahelp hid=\".\">Click to access txt files.</ahelp>"
-msgstr "<ahelp hid=\".\">按一下以存取 txt 檔案。</ahelp>"
-
-#. E5S76
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN10643\n"
-"help.text"
-msgid "'Comma separated value' files (*.csv)"
-msgstr "「逗號分隔值」檔案 (*.csv)"
-
-#. 2fDr2
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN10647\n"
-"help.text"
-msgid "<ahelp hid=\".\">Click to access csv files.</ahelp>"
-msgstr "<ahelp hid=\".\">按一下以存取 csv 檔案。</ahelp>"
-
-#. EVBCK
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN10666\n"
-"help.text"
-msgid "Custom"
-msgstr "自訂"
-
-#. 3Z5fx
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN1066A\n"
-"help.text"
-msgid "<ahelp hid=\".\">Click to access custom files. Enter the extension in the text box.</ahelp>"
-msgstr "<ahelp hid=\".\">按一下以存取自訂檔案。在文字方塊中輸入副檔名。</ahelp>"
-
-#. rts2F
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN10581\n"
-"help.text"
-msgid "Field separator"
-msgstr "欄位分隔符"
-
-#. 3G6QU
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN10585\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter or select the character that separates data fields in the text file.</ahelp>"
-msgstr ""
-
-#. 8rxWL
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN1059C\n"
-"help.text"
-msgid "Text separator"
-msgstr "文字分隔符"
-
-#. ejFpV
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN105A0\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter or select the character that identifies a text field in the text file.</ahelp> You cannot use the same character as the field separator."
-msgstr ""
-
-#. rSTcV
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN105B8\n"
-"help.text"
-msgid "Decimal separator"
-msgstr "小數點分隔符"
-
-#. apBAu
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN105BC\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter or select the character that is used as a decimal separator in the text file, for example, a period (0.5) or a comma (0,5).</ahelp>"
-msgstr ""
-
-#. CyhGN
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN105D3\n"
-"help.text"
-msgid "Thousands separator"
-msgstr "千位分隔符"
-
-#. 6TTiq
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN105D7\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter or select the character that is used as a thousands separator in the text file, for example a comma (1,000), or a period (1.000).</ahelp>"
-msgstr ""
-
#. rw2xT
#: menubar.xhp
msgctxt ""
@@ -3913,13 +2446,13 @@ msgctxt ""
msgid "Report Builder"
msgstr "報表產生器"
-#. 2cgJb
+#. Yyb28
#: rep_main.xhp
msgctxt ""
"rep_main.xhp\n"
"bm_id1614429\n"
"help.text"
-msgid "<bookmark_value>Report Builder</bookmark_value><bookmark_value>Oracle Report Builder</bookmark_value>"
+msgid "<bookmark_value>Report Builder</bookmark_value> <bookmark_value>Oracle Report Builder</bookmark_value>"
msgstr ""
#. 8XCCL
@@ -4192,13 +2725,13 @@ msgctxt ""
msgid "After selecting the table, press the Tab key to leave the Content box."
msgstr "選取表格後,按 Tab 鍵離開 [內容] 方塊。"
-#. 6vbRr
+#. TFFLy
#: rep_main.xhp
msgctxt ""
"rep_main.xhp\n"
"par_id2531815\n"
"help.text"
-msgid "The <embedvar href=\"text/shared/explorer/database/rep_insertfield.xhp#addfields\" markup=\"ignore\"/> window opens automatically and shows all fields of the selected table."
+msgid "The <link href=\"text/shared/explorer/database/rep_insertfield.xhp\" name=\"add_fields_link\">Add fields to report</link> window opens automatically and shows all fields of the selected table."
msgstr ""
#. vsFKB
@@ -4939,13 +3472,13 @@ msgctxt ""
msgid "Properties"
msgstr "特性"
-#. e5chy
+#. wAcV9
#: rep_prop.xhp
msgctxt ""
"rep_prop.xhp\n"
"hd_id8836939\n"
"help.text"
-msgid "<variable id=\"rep_prop\"><link href=\"text/shared/explorer/database/rep_prop.xhp\">Properties</link> </variable>"
+msgid "<variable id=\"rep_prop\"><link href=\"text/shared/explorer/database/rep_prop.xhp\">Properties</link></variable>"
msgstr ""
#. ro5Tm
@@ -4984,13 +3517,13 @@ msgctxt ""
msgid "Select a table from the Contents list, then press Tab or click outside the input box to leave the input box."
msgstr "從 [內容] 清單中選取一個表格,然後按 Tab 鍵或按一下輸入方塊外部以離開輸入方塊。"
-#. 9hPaG
+#. DZ342
#: rep_prop.xhp
msgctxt ""
"rep_prop.xhp\n"
"par_id3587145\n"
"help.text"
-msgid "<ahelp hid=\".\">The <embedvar href=\"text/shared/explorer/database/rep_insertfield.xhp#addfields\" markup=\"ignore\"/> window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type=\"menuitem\">View - Add Field</item>.</ahelp>"
+msgid "<ahelp hid=\".\">The <link href=\"text/shared/explorer/database/rep_insertfield.xhp\" name=\"add_fields_link\">Add fields to report</link> window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type=\"menuitem\">View - Add Field</item>.</ahelp>"
msgstr ""
#. 5BJS6
diff --git a/source/zh-TW/helpcontent2/source/text/shared/guide.po b/source/zh-TW/helpcontent2/source/text/shared/guide.po
index 614abf77d95..653ffb62042 100644
--- a/source/zh-TW/helpcontent2/source/text/shared/guide.po
+++ b/source/zh-TW/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-10-04 19:51+0200\n"
+"POT-Creation-Date: 2021-10-25 12:49+0200\n"
"PO-Revision-Date: 2019-08-09 08:03+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4048,13 +4048,31 @@ msgctxt ""
msgid "<link href=\"text/shared/guide/convertfilters.xhp\" name=\"conversion filter names\">File Conversion Filter Names</link>"
msgstr ""
-#. G5KB2
+#. EoDwz
#: convertfilters.xhp
msgctxt ""
"convertfilters.xhp\n"
"par_id581554399002498\n"
"help.text"
-msgid "<variable id=\"variable name\"> <ahelp hid=\".\">Tables with filter names for command line document conversion.</ahelp> </variable>"
+msgid "<variable id=\"commandline_intro\"> <ahelp hid=\".\">Tables with filter names for <link href=\"text/shared/guide/start_parameters.xhp\" name=\"commandline\">command line</link> document conversion.</ahelp> </variable>"
+msgstr ""
+
+#. Whybs
+#: convertfilters.xhp
+msgctxt ""
+"convertfilters.xhp\n"
+"hd_id531633524464103\n"
+"help.text"
+msgid "Usage"
+msgstr ""
+
+#. vcWaC
+#: convertfilters.xhp
+msgctxt ""
+"convertfilters.xhp\n"
+"par_id801633524474460\n"
+"help.text"
+msgid "Filter names are used when importing and exporting files in alien formats and converting files formats through the <link href=\"text/shared/guide/start_parameters.xhp\" name=\"commandline\">command line</link>."
msgstr ""
#. QAzjK
@@ -4408,6 +4426,15 @@ msgctxt ""
msgid "Writer Layout XML"
msgstr ""
+#. nxmVA
+#: convertfilters.xhp
+msgctxt ""
+"convertfilters.xhp\n"
+"FilterName_writer_indexing_export\n"
+"help.text"
+msgid "Writer Indexing Export XML"
+msgstr ""
+
#. Va5zD
#: convertfilters.xhp
msgctxt ""
@@ -20464,13 +20491,13 @@ msgctxt ""
msgid "Open the document, entering the correct password. Choose <emph>File - Save As</emph> and clear the <emph>Save with password</emph> check box."
msgstr "輸入正確的密碼來開啟文件。<emph>「檔案」-「另存新檔」</emph>功能表指令,取消<emph>「使用密碼儲存」</emph>的標記。"
-#. FepzD
+#. mqKud
#: protection.xhp
msgctxt ""
"protection.xhp\n"
"par_id761632164002322\n"
"help.text"
-msgid "It is possible to use OpenPGP to define private and public keys to be used to encrypt %PRODUCTNAME documents. Read <embedvar href=\"text/shared/guide/openpgp.xhp#openpgph1\"/> to learn more on how to set up OpenPGP encryption keys."
+msgid "It is possible to use OpenPGP to define private and public keys to be used to encrypt %PRODUCTNAME documents. Read <link href=\"text/shared/guide/openpgp.xhp\" name=\"openpgp_link\">Encrypting Documents with OpenPGP</link> to learn more on how to set up OpenPGP encryption keys."
msgstr ""
#. HfUCF
@@ -21112,14 +21139,14 @@ msgctxt ""
msgid "Accepting or Rejecting Changes"
msgstr "接受或拒絕變更"
-#. pqiWr
+#. yyZeG
#: redlining_accept.xhp
msgctxt ""
"redlining_accept.xhp\n"
"bm_id3150247\n"
"help.text"
-msgid "<bookmark_value>changes; accepting or rejecting</bookmark_value><bookmark_value>review function;accepting or rejecting changes</bookmark_value>"
-msgstr "<bookmark_value>變更; 接受或拒絕</bookmark_value><bookmark_value>審閱功能;接受或拒絕變更</bookmark_value>"
+msgid "<bookmark_value>changes; accepting or rejecting</bookmark_value> <bookmark_value>review function;accepting or rejecting changes</bookmark_value>"
+msgstr ""
#. FTaFc
#: redlining_accept.xhp
@@ -21157,14 +21184,14 @@ msgctxt ""
msgid "When you edit a document in which others have made changes, you can accept or reject the changes individually or all together."
msgstr "編輯他人已變更過的文件時,您可以接受個別變更或所有變更,也可以拒絕個別變更或所有變更。"
-#. XCt7P
+#. 5zm2G
#: redlining_accept.xhp
msgctxt ""
"redlining_accept.xhp\n"
"par_id3147008\n"
"help.text"
-msgid "If you have put multiple copies of the document in circulation, first merge these into one document (see <embedvar href=\"text/shared/guide/redlining_docmerge.xhp#redlining_docmerge\"/>)."
-msgstr "如果您已將文件的多個副本置於循環中,則請先將這些副本合併為一個文件 (請參閱<embedvar href=\"text/shared/guide/redlining_docmerge.xhp#redlining_docmerge\"/>)。"
+msgid "If you have put multiple copies of the document in circulation, first merge these into one document (see <link href=\"text/shared/guide/redlining_docmerge.xhp\" name=\"redlining_docmerge_link\">Merging Versions</link>)."
+msgstr ""
#. Rk8jv
#: redlining_accept.xhp
@@ -22966,49 +22993,76 @@ msgctxt ""
msgid "Starting $[officename] Software From the Command Line"
msgstr ""
-#. gqJUq
+#. 7E3QP
#: start_parameters.xhp
msgctxt ""
"start_parameters.xhp\n"
"par_id3156152\n"
"help.text"
-msgid "Under Windows, select <emph>Run</emph> from the Windows Start menu, or open a shell under Linux, *BSD, or macOS platforms."
+msgid "Select <emph>Run</emph> from the Windows Start menu."
msgstr ""
-#. bvyAG
+#. xf2BF
#: start_parameters.xhp
msgctxt ""
"start_parameters.xhp\n"
"par_id3152472\n"
"help.text"
-msgid "Under Windows, type the following text in the <emph>Open </emph>text field and click <emph>OK</emph>."
+msgid "Type the following text in the <emph>Open</emph> text field and click <emph>OK</emph>."
msgstr ""
-#. hm8EE
+#. nMQWE
#: start_parameters.xhp
msgctxt ""
"start_parameters.xhp\n"
-"par_id3149669\n"
+"par_id3147561\n"
"help.text"
-msgid "Under UNIX-like systems, type the following line of text, then press <emph>Return</emph>:"
+msgid "{install}\\program\\soffice.exe {parameter}"
msgstr ""
-#. Q5DoA
+#. mmyAy
#: start_parameters.xhp
msgctxt ""
"start_parameters.xhp\n"
-"par_id3147561\n"
+"par_id3153360\n"
"help.text"
-msgid "<switchinline select=\"sys\"><caseinline select=\"WIN\">{install}\\program\\soffice.exe {parameter}</caseinline><caseinline select=\"UNIX\">{install}/program/soffice {parameter}</caseinline></switchinline>"
+msgid "Replace <emph>{install}</emph> with the path to your installation of %PRODUCTNAME software (for example, <emph>C:\\Program Files\\%PRODUCTNAME</emph>"
msgstr ""
-#. n4TUN
+#. x5jE9
#: start_parameters.xhp
msgctxt ""
"start_parameters.xhp\n"
-"par_id3153360\n"
+"par_id3157152\n"
"help.text"
-msgid "Replace <emph>{install}</emph> with the path to your installation of $[officename] software (for example, <emph>C:\\Program Files\\Office</emph> in Windows, or <emph>~/office</emph> in UNIX)"
+msgid "Open a shell under Linux, *BSD, or macOS platforms."
+msgstr ""
+
+#. LEs72
+#: start_parameters.xhp
+msgctxt ""
+"start_parameters.xhp\n"
+"par_id3147669\n"
+"help.text"
+msgid "Type the following line of text, then press <emph>Return</emph>:"
+msgstr ""
+
+#. smkWS
+#: start_parameters.xhp
+msgctxt ""
+"start_parameters.xhp\n"
+"par_id3143561\n"
+"help.text"
+msgid "{install}/program/soffice {parameter}"
+msgstr ""
+
+#. BEAF7
+#: start_parameters.xhp
+msgctxt ""
+"start_parameters.xhp\n"
+"par_id3157360\n"
+"help.text"
+msgid "Replace <emph>{install}</emph> with the path to your installation of %PRODUCTNAME software (for example, <emph>/opt/%PRODUCTNAME</emph> in UNIX)"
msgstr ""
#. 4EMfS
@@ -23236,13 +23290,13 @@ msgctxt ""
msgid "Store soffice.bin pid to <emph>{file}</emph>."
msgstr ""
-#. KsDn3
+#. 8kbVi
#: start_parameters.xhp
msgctxt ""
"start_parameters.xhp\n"
"par_id3146786\n"
"help.text"
-msgid "Sets the <emph>DISPLAY </emph>environment variable on UNIX-like platforms to the value <emph>{display}</emph>. This parameter is only supported by the start script for $[officename] software on UNIX-like platforms."
+msgid "Sets the <emph>DISPLAY</emph> environment variable on UNIX-like platforms to the value <emph>{display}</emph>. This parameter is only supported by the start script for $[officename] software on UNIX-like platforms."
msgstr ""
#. 67rps
@@ -23695,22 +23749,13 @@ msgctxt ""
msgid "Opens and starts the following presentation documents of each immediately. Files are closed after the showing. Files other than Impress documents are opened in default mode , regardless of previous mode."
msgstr ""
-#. 7TVQD
-#: start_parameters.xhp
-msgctxt ""
-"start_parameters.xhp\n"
-"par_id315053p\n"
-"help.text"
-msgid "Batch convert files (implies --headless). If --outdir isn't specified, then current working directory is used as output_dir."
-msgstr ""
-
-#. bcvZm
+#. N3vAB
#: start_parameters.xhp
msgctxt ""
"start_parameters.xhp\n"
"par_id2016120401222926\n"
"help.text"
-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:"
+msgid "If --convert-to is used more than once, last value of OutputFileExtension[:OutputFilterName[:OutputFilterParams]] is effective. If --outdir is used more than once, only its last value is effective. For example:"
msgstr ""
#. RYx7a
diff --git a/source/zh-TW/helpcontent2/source/text/shared/optionen.po b/source/zh-TW/helpcontent2/source/text/shared/optionen.po
index c5a70938a5d..bb90d1cf7f7 100644
--- a/source/zh-TW/helpcontent2/source/text/shared/optionen.po
+++ b/source/zh-TW/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-09-20 13:03+0200\n"
+"POT-Creation-Date: 2021-10-25 12:49+0200\n"
"PO-Revision-Date: 2019-08-09 08:03+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12256,14 +12256,14 @@ msgctxt ""
msgid "Print"
msgstr "列印"
-#. dpEFJ
+#. KfecA
#: 01070400.xhp
msgctxt ""
"01070400.xhp\n"
"bm_id3155450\n"
"help.text"
-msgid "<bookmark_value>printing; drawings defaults</bookmark_value><bookmark_value>drawings; printing defaults</bookmark_value><bookmark_value>pages;printing page names in presentations</bookmark_value><bookmark_value>printing; dates in presentations</bookmark_value><bookmark_value>dates; printing in presentations</bookmark_value><bookmark_value>times; inserting when printing presentations</bookmark_value><bookmark_value>printing; hidden pages of presentations</bookmark_value><bookmark_value>hidden pages; printing in presentations</bookmark_value><bookmark_value>printing; without scaling in presentations</bookmark_value><bookmark_value>scaling; when printing presentations</bookmark_value><bookmark_value>printing; fitting to pages in presentations</bookmark_value><bookmark_value>fitting to pages; print settings in presentations</bookmark_value><bookmark_value>printing; tiling pages in presentations</bookmark_value>"
-msgstr "<bookmark_value>列印; 繪圖預設值</bookmark_value><bookmark_value>繪圖; 列印預設值</bookmark_value><bookmark_value>頁面; 簡報中的列印頁面名稱</bookmark_value><bookmark_value>列印; 簡報中的日期</bookmark_value><bookmark_value>日期; 在簡報中列印</bookmark_value><bookmark_value>時間; 列印簡報時插入</bookmark_value><bookmark_value>列印; 簡報的隱藏頁面</bookmark_value><bookmark_value>隱藏頁面; 在簡報中列印</bookmark_value><bookmark_value>列印; 在簡報中無比例縮放</bookmark_value><bookmark_value>顯示比例; 列印簡報時</bookmark_value><bookmark_value>列印; 符合簡報中的頁面大小</bookmark_value><bookmark_value>符合頁面大小; 簡報中的列印設定</bookmark_value><bookmark_value>列印; 簡報中的平鋪頁面</bookmark_value>"
+msgid "<bookmark_value>printing; drawings defaults</bookmark_value> <bookmark_value>drawings; printing defaults</bookmark_value> <bookmark_value>pages;printing page names in presentations</bookmark_value> <bookmark_value>printing; dates in presentations</bookmark_value> <bookmark_value>dates; printing in presentations</bookmark_value> <bookmark_value>times; inserting when printing presentations</bookmark_value> <bookmark_value>printing; hidden pages of presentations</bookmark_value> <bookmark_value>hidden pages; printing in presentations</bookmark_value> <bookmark_value>printing; without scaling in presentations</bookmark_value> <bookmark_value>scaling; when printing presentations</bookmark_value> <bookmark_value>printing; fitting to pages in presentations</bookmark_value> <bookmark_value>fitting to pages; print settings in presentations</bookmark_value> <bookmark_value>printing; tiling pages in presentations</bookmark_value>"
+msgstr ""
#. iFJBG
#: 01070400.xhp
@@ -12382,14 +12382,14 @@ msgctxt ""
msgid "Quality"
msgstr "列印品質"
-#. vYV69
+#. 8fAoE
#: 01070400.xhp
msgctxt ""
"01070400.xhp\n"
"par_id3147229\n"
"help.text"
-msgid "See also <embedvar href=\"text/shared/guide/print_blackwhite.xhp#print_blackwhite\"/>."
-msgstr "另請參閱<embedvar href=\"text/shared/guide/print_blackwhite.xhp#print_blackwhite\"/>。"
+msgid "See also <link href=\"text/shared/guide/print_blackwhite.xhp\" name=\"print_blackwhite_link\">Printing in Black and White</link>."
+msgstr ""
#. KK8qW
#: 01070400.xhp
@@ -15460,13 +15460,13 @@ msgctxt ""
msgid "Detailed Calculation"
msgstr ""
-#. n3FEk
+#. ELsuG
#: detailedcalculation.xhp
msgctxt ""
"detailedcalculation.xhp\n"
"bm_id3146799\n"
"help.text"
-msgid "<bookmark_value>string;conversion to number settings</bookmark_value><bookmark_value>string conversion to number options</bookmark_value><bookmark_value>string;conversion to date settings</bookmark_value><bookmark_value>string conversion to date options</bookmark_value><bookmark_value>string;conversion to reference settings</bookmark_value><bookmark_value>string conversion to reference options</bookmark_value><bookmark_value>string;setting in spreadsheet formulas</bookmark_value><bookmark_value>cell reference syntax in strings;Excel R1C1</bookmark_value><bookmark_value>cell reference syntax in strings;Excel A1</bookmark_value><bookmark_value>cell reference syntax in strings;Calc A1</bookmark_value><bookmark_value>Excel R1C1;cell reference syntax in strings</bookmark_value><bookmark_value>Excel A1;cell reference syntax in strings</bookmark_value><bookmark_value>Calc A1;cell reference syntax in strings</bookmark_value>"
+msgid "<bookmark_value>string;conversion to number settings</bookmark_value> <bookmark_value>string conversion to number options</bookmark_value> <bookmark_value>string;conversion to date settings</bookmark_value> <bookmark_value>string conversion to date options</bookmark_value> <bookmark_value>string;conversion to reference settings</bookmark_value> <bookmark_value>string conversion to reference options</bookmark_value> <bookmark_value>string;setting in spreadsheet formulas</bookmark_value> <bookmark_value>cell reference syntax in strings;Excel R1C1</bookmark_value> <bookmark_value>cell reference syntax in strings;Excel A1</bookmark_value> <bookmark_value>cell reference syntax in strings;Calc A1</bookmark_value> <bookmark_value>Excel R1C1;cell reference syntax in strings</bookmark_value> <bookmark_value>Excel A1;cell reference syntax in strings</bookmark_value> <bookmark_value>Calc A1;cell reference syntax in strings</bookmark_value>"
msgstr ""
#. jZZNb
@@ -15541,13 +15541,13 @@ msgctxt ""
msgid "<emph>Treat as zero:</emph> Any text found where numeric data is expected will be considered as a number of value zero. Example: <item type=\"input\">\"123.45\"</item> will map to zero, while <item type=\"input\">123.45</item> not."
msgstr ""
-#. XLNWu
+#. 8VbMZ
#: detailedcalculation.xhp
msgctxt ""
"detailedcalculation.xhp\n"
"par_id3067110\n"
"help.text"
-msgid "<emph>Convert only if unambiguous:</emph> If the text represents a valid and unambiguous numeric value, convert it. Example: <item type=\"input\">\"123.456\"</item> will generate a #VALUE! error because the text contains a separator, while <item type=\"input\">\"123456\"</item> will not.<br/>See <embedvar href=\"text/scalc/guide/numbers_text.xhp#numbers_text\" markup=\"ignore\"/> for details."
+msgid "<emph>Convert only if unambiguous:</emph> If the text represents a valid and unambiguous numeric value, convert it. Example: <item type=\"input\">\"123.456\"</item> will generate a #VALUE! error because the text contains a separator, while <item type=\"input\">\"123456\"</item> will not.<br/>See <link href=\"text/scalc/guide/numbers_text.xhp\" name=\"numbers_text_link\">Converting Text to Numbers</link> for details."
msgstr ""
#. Eo47W
diff --git a/source/zh-TW/helpcontent2/source/text/simpress/00.po b/source/zh-TW/helpcontent2/source/text/simpress/00.po
index 44440f8ea83..88381f686e1 100644
--- a/source/zh-TW/helpcontent2/source/text/simpress/00.po
+++ b/source/zh-TW/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: 2021-09-20 13:03+0200\n"
+"POT-Creation-Date: 2021-10-20 13:08+0200\n"
"PO-Revision-Date: 2018-04-17 16:01+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1438,6 +1438,15 @@ msgctxt ""
msgid "<variable id=\"seitenvorlage\">Choose <menuitem>Slide - Change Slide Master</menuitem> </variable>"
msgstr ""
+#. E75uy
+#: slide_menu.xhp
+msgctxt ""
+"slide_menu.xhp\n"
+"par_id911634055593609\n"
+"help.text"
+msgid "<variable id=\"loadslidedesign\">Choose <menuitem>Slide - Change Slide Master - Load</menuitem></variable>"
+msgstr ""
+
#. Whnor
#: slide_menu.xhp
msgctxt ""
@@ -1456,13 +1465,13 @@ msgctxt ""
msgid "On the <emph>Presentation</emph> bar, click"
msgstr "在 <emph>[簡報]</emph> 列上,按一下"
-#. FMkRy
+#. gBMvH
#: slide_menu.xhp
msgctxt ""
"slide_menu.xhp\n"
"par_id3685251\n"
"help.text"
-msgid "<image id=\"img_id3183073\" src=\"cmd/sc_insertpage.png\" width=\"0.566cm\" height=\"0.566cm\"><alt id=\"alt_id3183073\">Icon</alt></image>"
+msgid "<image id=\"img_id3183073\" src=\"cmd/sc_insertpage.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3183073\">Icon New slide</alt></image>"
msgstr ""
#. brVDD
diff --git a/source/zh-TW/helpcontent2/source/text/simpress/01.po b/source/zh-TW/helpcontent2/source/text/simpress/01.po
index b24809a38be..19c2bf3d239 100644
--- a/source/zh-TW/helpcontent2/source/text/simpress/01.po
+++ b/source/zh-TW/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-09-10 23:11+0200\n"
+"POT-Creation-Date: 2021-10-25 12:49+0200\n"
"PO-Revision-Date: 2019-08-09 08:03+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3895,6 +3895,24 @@ msgctxt ""
msgid "Change Slide Master"
msgstr ""
+#. bBY5z
+#: 05120000.xhp
+msgctxt ""
+"05120000.xhp\n"
+"hd_id3164253\n"
+"help.text"
+msgid "<link href=\"text/simpress/01/05120000.xhp\" name=\"Change Slide Master\">Master Page</link>"
+msgstr ""
+
+#. Pz8J7
+#: 05120000.xhp
+msgctxt ""
+"05120000.xhp\n"
+"par_id3108485\n"
+"help.text"
+msgid "<variable id=\"masterpagetext\"><ahelp hid=\".uno:PresentationLayout\">Displays the <emph>Available Master Slides</emph> dialog, where you can select a layout scheme for the current page. Any objects in the page design are inserted behind objects in the current page.</ahelp></variable>"
+msgstr ""
+
#. Jg7LJ
#: 05120000.xhp
msgctxt ""
@@ -3976,114 +3994,24 @@ msgctxt ""
msgid "Load"
msgstr "載入..."
-#. PJUGm
+#. wvNGM
#: 05120000.xhp
msgctxt ""
"05120000.xhp\n"
-"par_id3156020\n"
-"help.text"
-msgid "<ahelp hid=\"modules/simpress/ui/slidedesigndialog/load\">Displays the <link href=\"text/simpress/01/05120100.xhp\" name=\"Load Master Slide\"><emph>Load Master Slide</emph></link> dialog, where you can select additional slide designs.</ahelp>"
-msgstr ""
-
-#. sQnAB
-#: 05120100.xhp
-msgctxt ""
-"05120100.xhp\n"
-"tit\n"
-"help.text"
-msgid "Load Master Slide"
-msgstr ""
-
-#. cVSPz
-#: 05120100.xhp
-msgctxt ""
-"05120100.xhp\n"
-"hd_id3153728\n"
+"par_id3956020\n"
"help.text"
-msgid "Load Master Slide"
+msgid "<ahelp hid=\"modules/simpress/ui/slidedesigndialog/load\">Displays the <link href=\"text/swriter/01/05170000.xhp\" name=\"Load Master Slide\"><emph>Load Master Page</emph></link> dialog, where you can select additional page designs.</ahelp>"
msgstr ""
-#. DB49E
-#: 05120100.xhp
-msgctxt ""
-"05120100.xhp\n"
-"par_id3150717\n"
-"help.text"
-msgid "Load additional slide designs for your presentation."
-msgstr "載入其他投影片設計供您的簡報使用。"
-
-#. fs4kq
-#: 05120100.xhp
-msgctxt ""
-"05120100.xhp\n"
-"par_id3154016\n"
-"help.text"
-msgid "Select a design category, and then a template you want to apply."
-msgstr "選取設計分類,然後再選取要採用的文件樣式。"
-
-#. Mfa22
-#: 05120100.xhp
-msgctxt ""
-"05120100.xhp\n"
-"hd_id3150327\n"
-"help.text"
-msgid "Categories"
-msgstr "分類標題"
-
-#. Qjzs5
-#: 05120100.xhp
-msgctxt ""
-"05120100.xhp\n"
-"par_id3147338\n"
-"help.text"
-msgid "<ahelp hid=\"sfx/ui/loadtemplatedialog/categories\">Displays the available slide design categories.</ahelp>"
-msgstr "<ahelp hid=\"sfx/ui/loadtemplatedialog/categories\">顯示可用的投影片設計分類。</ahelp>"
-
-#. SFJp7
-#: 05120100.xhp
-msgctxt ""
-"05120100.xhp\n"
-"hd_id3155962\n"
-"help.text"
-msgid "Templates"
-msgstr "樣式"
-
-#. AgvvA
-#: 05120100.xhp
-msgctxt ""
-"05120100.xhp\n"
-"par_id3155337\n"
-"help.text"
-msgid "<ahelp hid=\"sfx/ui/loadtemplatedialog/templates\">Displays the templates for the selected design category.</ahelp>"
-msgstr "<ahelp hid=\"sfx/ui/loadtemplatedialog/templates\">顯示所選設計分類的範本。</ahelp>"
-
-#. SL4AQ
-#: 05120100.xhp
-msgctxt ""
-"05120100.xhp\n"
-"hd_id3145791\n"
-"help.text"
-msgid "More>>"
-msgstr "其它>>"
-
-#. 3B6Mz
-#: 05120100.xhp
+#. LZr7A
+#: 05120000.xhp
msgctxt ""
-"05120100.xhp\n"
-"par_id3150344\n"
+"05120000.xhp\n"
+"par_id3156020\n"
"help.text"
-msgid "<ahelp hid=\"sfx/ui/loadtemplatedialog/expander\">Shows or hides a preview of a selected template.</ahelp>"
+msgid "<ahelp hid=\"modules/simpress/ui/slidedesigndialog/load\">Displays the <link href=\"text/swriter/01/05170000.xhp\" name=\"Load Master Slide\"><emph>Load Master Slide</emph></link> dialog, where you can select additional slide designs.</ahelp>"
msgstr ""
-#. PEjDN
-#: 05120100.xhp
-msgctxt ""
-"05120100.xhp\n"
-"par_id3159206\n"
-"help.text"
-msgid "Some templates may not contain visible text objects or drawing objects."
-msgstr "某些文件樣式可能不包含可見的文字物件或繪圖物件。"
-
#. BLSEy
#: 05120500m.xhp
msgctxt ""
@@ -4633,14 +4561,14 @@ msgctxt ""
msgid "<ahelp hid=\"cui/ui/connectortabpage/MTR_FLD_LINE_3\">Enter a skew value for Line 3.</ahelp>"
msgstr "<ahelp hid=\"cui/ui/connectortabpage/MTR_FLD_LINE_3\" visibility=\"visible\">為線條 3 輸入偏斜值。</ahelp>"
-#. 4z7yG
+#. 4DA83
#: 05170000.xhp
msgctxt ""
"05170000.xhp\n"
-"hd_id3145581\n"
+"hd_id291634825392062\n"
"help.text"
msgid "Line spacing"
-msgstr "線間隔"
+msgstr ""
#. t5Pe9
#: 05170000.xhp
@@ -4732,14 +4660,14 @@ msgctxt ""
msgid "Reset line skew"
msgstr "重新設定線條走向"
-#. WE2nx
+#. Y3yHa
#: 05170000.xhp
msgctxt ""
"05170000.xhp\n"
"par_id3159205\n"
"help.text"
-msgid "<ahelp hid=\".uno:NewRouting\">Resets the line skew values to the default.</ahelp><embedvar href=\"text/shared/00/00000001.xhp#kontext\"/>"
-msgstr "<ahelp hid=\".uno:NewRouting\" visibility=\"visible\">將線條偏斜值重設為預設值。</ahelp>。<embedvar href=\"text/shared/00/00000001.xhp#kontext\"/>"
+msgid "<ahelp hid=\".uno:NewRouting\">Resets the line skew values to the default.</ahelp> (This command is only accessible through the <link href=\"text/shared/00/00000005.xhp#contextmenu\" name=\"context menu\">context menu</link>)."
+msgstr ""
#. JLBKm
#: 05250000.xhp
@@ -7036,41 +6964,50 @@ msgctxt ""
msgid "Custom Slide Shows"
msgstr "自訂投影片放映"
-#. fdjRS
+#. 9BTtN
#: 06100000.xhp
msgctxt ""
"06100000.xhp\n"
"hd_id3154659\n"
"help.text"
-msgid "Custom Slide Shows"
-msgstr "自訂投影片放映"
+msgid "<variable id=\"CustomShow_h1\"><link href=\"text/simpress/01/06100000.xhp\" name=\"CustomShow_link\">Custom Slide Shows</link></variable>"
+msgstr ""
-#. CipVc
+#. EB558
#: 06100000.xhp
msgctxt ""
"06100000.xhp\n"
"par_id3149207\n"
"help.text"
-msgid "<variable id=\"indipraesent\"><ahelp hid=\".uno:CustomShowDialog\">Defines a custom slide show using slides within the current presentation. You can then pick slides to meet the needs of your audience. You can create as many custom slide shows as you want.</ahelp></variable>"
-msgstr "<variable id=\"indipraesent\"><ahelp hid=\".uno:CustomShowDialog\">使用目前簡報中的投影片定義自訂投影片放映。您可挑選一些投影片以滿足觀眾的需要。您可建立多個自訂投影片放映,沒有數目限制。</ahelp></variable>"
+msgid "<variable id=\"indipraesent\"><ahelp hid=\".uno:CustomShowDialog\">Defines a custom slide show using slides within the current presentation. You can then pick slides to meet the needs of your audience. You can create as many custom slide shows as you want.</ahelp> </variable>"
+msgstr ""
-#. j9xFw
+#. YgWfS
+#: 06100000.xhp
+msgctxt ""
+"06100000.xhp\n"
+"par_id641634164174393\n"
+"help.text"
+msgid "Read the help page <link href=\"text/simpress/guide/individual.xhp#individual\">Creating a Custom Slide Show</link> to learn more about how to set up your own custom slide shows."
+msgstr ""
+
+#. JyjJt
#: 06100000.xhp
msgctxt ""
"06100000.xhp\n"
"hd_id3155530\n"
"help.text"
-msgid "Name of the presentation(s)"
-msgstr "簡報名稱"
+msgid "List of custom slide shows"
+msgstr ""
-#. TEnog
+#. 9WeMN
#: 06100000.xhp
msgctxt ""
"06100000.xhp\n"
"par_id3156449\n"
"help.text"
-msgid "<ahelp hid=\"modules/simpress/ui/customslideshows/customshowlist\">Lists the custom slide shows that are available.</ahelp>"
-msgstr "<ahelp hid=\"modules/simpress/ui/customslideshows/customshowlist\">列出可用的自訂投影片放映。</ahelp>"
+msgid "<ahelp hid=\"modules/simpress/ui/customslideshows/customshowlist\">Lists the custom slide shows that are available in the document.</ahelp>"
+msgstr ""
#. T3UBF
#: 06100000.xhp
@@ -7081,24 +7018,6 @@ msgctxt ""
msgid "To create a custom slide show, click <emph>New</emph>."
msgstr "若要建立自訂投影片放映,請按一下<emph>[新建]</emph>。"
-#. BbVpd
-#: 06100000.xhp
-msgctxt ""
-"06100000.xhp\n"
-"hd_id3152899\n"
-"help.text"
-msgid "Use Custom Slide Show"
-msgstr "使用自訂投影片放映"
-
-#. aajoE
-#: 06100000.xhp
-msgctxt ""
-"06100000.xhp\n"
-"par_id3149947\n"
-"help.text"
-msgid "<ahelp hid=\"modules/simpress/ui/customslideshows/usecustomshows\">Runs the custom slide show you selected when you click <emph>Start</emph>. Otherwise, the entire presentation is shown.</ahelp>"
-msgstr "<ahelp hid=\"modules/simpress/ui/customslideshows/usecustomshows\">按一下 <emph>[開始]</emph> 以執行所選自訂投影片放映。否則將放映整份簡報。</ahelp>"
-
#. tmqBb
#: 06100000.xhp
msgctxt ""
@@ -7108,14 +7027,14 @@ msgctxt ""
msgid "To run a custom slide show:"
msgstr "如果您已至少新增了一個個別簡報,則可以在清單方塊中按一下這個簡報,然後放映。"
-#. 5B6tC
+#. KDQG6
#: 06100000.xhp
msgctxt ""
"06100000.xhp\n"
"par_id3153250\n"
"help.text"
-msgid "Click the show in the list and then select <emph>Use Custom Slide Show</emph>."
-msgstr "按一下清單中的放映,然後選取<emph>[使用者的放映簡報投影片]</emph>。"
+msgid "Select a custom slide show from the list."
+msgstr ""
#. yFmBx
#: 06100000.xhp
@@ -7180,14 +7099,14 @@ msgctxt ""
msgid "Start"
msgstr "開始"
-#. VEuA7
+#. EKdWF
#: 06100000.xhp
msgctxt ""
"06100000.xhp\n"
"par_id3157907\n"
"help.text"
-msgid "<ahelp hid=\"modules/simpress/ui/customslideshows/startshow\">Runs the slide show. Ensure that <emph>Use Custom Slide Show</emph> is selected if you want to run a custom presentation.</ahelp>"
-msgstr "<ahelp hid=\"modules/simpress/ui/customslideshows/startshow\">執行投影片放映。若要執行自訂簡報,請確定已選取 <emph>[採用使用者的投影片放映]</emph>。</ahelp>"
+msgid "<ahelp hid=\"modules/simpress/ui/customslideshows/startshow\">Runs the selected custom slide show.</ahelp>"
+msgstr ""
#. u5kLV
#: 06100100.xhp
diff --git a/source/zh-TW/helpcontent2/source/text/simpress/guide.po b/source/zh-TW/helpcontent2/source/text/simpress/guide.po
index 47eb3f64516..2dfc7b563da 100644
--- a/source/zh-TW/helpcontent2/source/text/simpress/guide.po
+++ b/source/zh-TW/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-10-04 19:51+0200\n"
+"POT-Creation-Date: 2021-10-25 12:49+0200\n"
"PO-Revision-Date: 2018-09-03 13:35+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5578,14 +5578,14 @@ msgctxt ""
msgid "Showing a Slide Show"
msgstr "顯示投影片放映"
-#. uZqFT
+#. TxTxS
#: show.xhp
msgctxt ""
"show.xhp\n"
"bm_id5592516\n"
"help.text"
-msgid "<bookmark_value>running slide shows</bookmark_value><bookmark_value>showing;slide shows</bookmark_value><bookmark_value>slide shows; starting</bookmark_value><bookmark_value>presentations; starting</bookmark_value><bookmark_value>starting; slide shows</bookmark_value><bookmark_value>automatic slide shows</bookmark_value><bookmark_value>slide transitions;automatic</bookmark_value><bookmark_value>automatic slide transition</bookmark_value>"
-msgstr "<bookmark_value>執行投影片放映</bookmark_value><bookmark_value>放映; 投影片放映</bookmark_value><bookmark_value>投影片放映; 啟動</bookmark_value><bookmark_value>簡報; 啟動</bookmark_value><bookmark_value>啟動; 投影片放映</bookmark_value><bookmark_value>自動投影片放映</bookmark_value><bookmark_value>投影片轉場; 自動</bookmark_value><bookmark_value>自動投影片轉場</bookmark_value>"
+msgid "<bookmark_value>running slide shows</bookmark_value> <bookmark_value>showing;slide shows</bookmark_value> <bookmark_value>slide shows; starting</bookmark_value> <bookmark_value>presentations; starting</bookmark_value> <bookmark_value>starting; slide shows</bookmark_value> <bookmark_value>automatic slide shows</bookmark_value> <bookmark_value>slide transitions;automatic</bookmark_value> <bookmark_value>automatic slide transition</bookmark_value>"
+msgstr ""
#. ZwZRH
#: show.xhp
@@ -5632,15 +5632,6 @@ msgctxt ""
msgid "Choose <emph>Slide Show - Slide Show</emph> to run the show."
msgstr "選擇 <emph>[投影片放映] - [投影片放映]</emph> 以執行放映。"
-#. B2HtF
-#: show.xhp
-msgctxt ""
-"show.xhp\n"
-"par_id4199957\n"
-"help.text"
-msgid "If you want all shows to start from the current slide instead of the first slide, choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Impress - General</emph> and click <emph>Always with current page</emph>."
-msgstr "若想要所有放映都從目前的投影片開始,而不是從第一張投影片開始,請選擇 <emph><switchinline select=\"sys\"><caseinline select=\"MAC\">[%PRODUCTNAME] - [喜好設定]</caseinline><defaultinline>[工具] - [選項]</defaultinline></switchinline> - [%PRODUCTNAME Impress] - [一般]</emph>,並按一下 <emph>[自動從目前的頁面開始]</emph>。"
-
#. RzXBe
#: show.xhp
msgctxt ""
@@ -5650,14 +5641,14 @@ msgctxt ""
msgid "Click to advance to the next effect or to the next slide."
msgstr "按一下前進至下一個效果或下一張投影片。"
-#. BDk6i
+#. dP9Vm
#: show.xhp
msgctxt ""
"show.xhp\n"
-"par_id8702658\n"
+"par_id391634159318692\n"
"help.text"
-msgid "Press <item type=\"keycode\">Esc</item> to abort the show before the end."
-msgstr "按 <item type=\"keycode\">Esc</item> 鍵可在結束前中斷放映。"
+msgid "Press <keycode>Esc</keycode> to abort the slide show before its end."
+msgstr ""
#. yF4a5
#: show.xhp
@@ -5695,23 +5686,23 @@ msgctxt ""
msgid "Open the <emph>Slide Transition</emph> sidebar deck."
msgstr "開啟 <emph>投影片轉場</emph> 側邊欄窗格。"
-#. vsNmF
+#. 9CjNM
#: show.xhp
msgctxt ""
"show.xhp\n"
"par_id9168980\n"
"help.text"
-msgid "In the <emph>Advance slide</emph> area, click <emph>Automatically after</emph>, and select a time duration."
-msgstr "在<emph>換頁</emph>區塊按一下 <emph>[下列時間後自動執行]</emph>,然後選取持續時間。"
+msgid "In the <emph>Advance Slide</emph> area, click <emph>After</emph> and enter a time duration."
+msgstr ""
-#. u3a9a
+#. HfVRx
#: show.xhp
msgctxt ""
"show.xhp\n"
"par_id9766533\n"
"help.text"
-msgid "Click <emph>Apply to All Slides</emph>."
-msgstr "按一下 <emph>[套用至全部投影片]</emph>。"
+msgid "Click <emph>Apply Transition to All Slides</emph>."
+msgstr ""
#. yfpGu
#: show.xhp
@@ -5740,14 +5731,14 @@ msgctxt ""
msgid "Choose <emph>Slide Show - Slide Show Settings</emph>."
msgstr "選擇 <emph>[投影片放映] - [投影片放映設定]</emph>。"
-#. 5CqC5
+#. Nyapm
#: show.xhp
msgctxt ""
"show.xhp\n"
"par_id1336405\n"
"help.text"
-msgid "In the Type area, click <emph>Auto</emph> and select a pause time between shows."
-msgstr "在 [類型] 區塊,按一下 <emph>[自動]</emph> 並選取放映之間的暫停時間。"
+msgid "In the <emph>Presentation Mode</emph> area, choose <emph>Loop and repeat after</emph> and set the duration of the pause between shows."
+msgstr ""
#. A4BCr
#: show.xhp
@@ -5767,15 +5758,6 @@ msgctxt ""
msgid "You can start %PRODUCTNAME from a command prompt, followed by the parameter <item type=\"literal\">-show</item> and an Impress filename. For example, to start the file <item type=\"literal\">filename.odp</item> from the command prompt, enter the following command:"
msgstr "您可從指令提示符號啟動 %PRODUCTNAME,在其後加上參數 <item type=\"literal\">-show</item> 及 Impress 檔案名稱。例如,若要從指令提示符號啟動檔案 <item type=\"literal\">filename.odp</item>,請輸入下列指令:"
-#. bfcES
-#: show.xhp
-msgctxt ""
-"show.xhp\n"
-"par_id1502121\n"
-"help.text"
-msgid "<item type=\"literal\">soffice -show filename.odp</item>"
-msgstr "<item type=\"literal\">soffice -show filename.odp</item>"
-
#. 7FZNV
#: show.xhp
msgctxt ""
diff --git a/source/zh-TW/helpcontent2/source/text/swriter.po b/source/zh-TW/helpcontent2/source/text/swriter.po
index 41676165a50..537d611d6e0 100644
--- a/source/zh-TW/helpcontent2/source/text/swriter.po
+++ b/source/zh-TW/helpcontent2/source/text/swriter.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-10 23:11+0200\n"
+"POT-Creation-Date: 2021-10-25 12:49+0200\n"
"PO-Revision-Date: 2018-10-21 20:41+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: chinese-l10n <chinese-l10n@googlegroups.com>\n"
@@ -2455,14 +2455,14 @@ msgctxt ""
msgid "<link href=\"text/swriter/01/05060200.xhp\" name=\"Wrap Off\">Wrap Off</link>"
msgstr "<link href=\"text/swriter/01/05060200.xhp\" name=\"不使用環繞\">不使用環繞</link>"
-#. Vus62
+#. PJcEB
#: main0215.xhp
msgctxt ""
"main0215.xhp\n"
"par_id3147419\n"
"help.text"
-msgid "<embedvar href=\"text/swriter/01/05060200.xhp#keinumlauftext\"/>You can also choose this setting on the <emph>Wrap</emph> tab page."
-msgstr "<embedvar href=\"text/swriter/01/05060200.xhp#keinumlauftext\"/>您也可以在<emph>「環繞」</emph>選項標籤中進行設定。"
+msgid "You can also choose this setting on the <emph>Wrap</emph> tab page."
+msgstr ""
#. n8sCd
#: main0215.xhp
@@ -2473,14 +2473,14 @@ msgctxt ""
msgid "<link href=\"text/swriter/01/05060200.xhp\" name=\"Wrap On\">Wrap On</link>"
msgstr "<link href=\"text/swriter/01/05060200.xhp\" name=\"使用環繞\">使用環繞</link>"
-#. cqLEM
+#. oCsKA
#: main0215.xhp
msgctxt ""
"main0215.xhp\n"
"par_id3153405\n"
"help.text"
-msgid "<embedvar href=\"text/swriter/01/05060200.xhp#seitenumlauftext\"/>This icon represents the <emph>Page Wrap</emph> option on the <emph>Wrap</emph> tab page."
-msgstr "<embedvar href=\"text/swriter/01/05060200.xhp#seitenumlauftext\"/>在這個功能裡,此圖示等於<emph>「環繞」</emph>選項標籤中的<emph>「頁面環繞」</emph>選項。"
+msgid "This icon represents the <emph>Page Wrap</emph> option on the <emph>Wrap</emph> tab page."
+msgstr ""
#. euDxv
#: main0215.xhp
@@ -2491,14 +2491,14 @@ msgctxt ""
msgid "<link href=\"text/swriter/01/05060200.xhp\" name=\"Wrap Through\">Wrap Through</link>"
msgstr "<link href=\"text/swriter/01/05060200.xhp\" name=\"穿過環繞\">穿過環繞</link>"
-#. FMaCU
+#. 3UyQZ
#: main0215.xhp
msgctxt ""
"main0215.xhp\n"
"par_id3147799\n"
"help.text"
-msgid "<embedvar href=\"text/swriter/01/05060200.xhp#durchlauftext\"/>You can also define this setting on the <emph>Wrap</emph> tab page."
-msgstr "<embedvar href=\"text/swriter/01/05060200.xhp#durchlauftext\"/>您也可以透過<emph>「環繞」</emph>選項標籤控制此功能。"
+msgid "You can also define this setting on the <emph>Wrap</emph> tab page."
+msgstr ""
#. UcRFJ
#: main0215.xhp
diff --git a/source/zh-TW/helpcontent2/source/text/swriter/00.po b/source/zh-TW/helpcontent2/source/text/swriter/00.po
index 5b527fcc2bc..5170ac7df89 100644
--- a/source/zh-TW/helpcontent2/source/text/swriter/00.po
+++ b/source/zh-TW/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-10-04 19:51+0200\n"
+"POT-Creation-Date: 2021-10-20 13:08+0200\n"
"PO-Revision-Date: 2018-11-14 12:13+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2167,14 +2167,14 @@ msgctxt ""
msgid "On the <emph>Table</emph> bar, click"
msgstr ""
-#. JGqGG
+#. zy5vV
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3153996\n"
"help.text"
-msgid "<image id=\"img_id3154002\" src=\"cmd/sc_mergecells.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3154002\">Icon</alt></image>"
-msgstr "<image id=\"img_id3154002\" src=\"cmd/sc_mergecells.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3154002\">圖示</alt></image>"
+msgid "<image id=\"img_id3154002\" src=\"cmd/sc_mergecells.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3154002\">Icon Merge Cells</alt></image>"
+msgstr ""
#. dpXBa
#: 00000405.xhp
@@ -2203,14 +2203,14 @@ msgctxt ""
msgid "On the <emph>Table</emph> bar, click"
msgstr ""
-#. 5TCpD
+#. 7E7fT
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3147270\n"
"help.text"
-msgid "<image id=\"img_id3147275\" src=\"cmd/sc_splitcell.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3147275\">Icon</alt></image>"
-msgstr "<image id=\"img_id3147275\" src=\"cmd/sc_splitcell.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3147275\">圖示</alt></image>"
+msgid "<image id=\"img_id3147275\" src=\"cmd/sc_splitcell.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3147275\">Icon Unmerge Cells</alt></image>"
+msgstr ""
#. 7XaPo
#: 00000405.xhp
@@ -2284,14 +2284,14 @@ msgctxt ""
msgid "Open <emph>Optimize Size</emph> toolbar from <emph>Table</emph> bar, click"
msgstr ""
-#. 3UF7h
+#. cH2we
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3145222\n"
"help.text"
-msgid "<image id=\"img_id3145228\" src=\"cmd/sc_setoptimalrowheight.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3145228\">Icon</alt></image>"
-msgstr "<image id=\"img_id3145228\" src=\"cmd/sc_setoptimalrowheight.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3145228\">圖示</alt></image>"
+msgid "<image id=\"img_id3145228\" src=\"cmd/sc_setoptimalrowheight.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3145228\">Icon Optimal Row Height</alt></image>"
+msgstr ""
#. fRVE5
#: 00000405.xhp
@@ -2320,14 +2320,14 @@ msgctxt ""
msgid "Open <emph>Optimize Size</emph> toolbar from <emph>Table</emph> bar, click"
msgstr ""
-#. PVPb8
+#. S6W6h
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3145297\n"
"help.text"
-msgid "<image id=\"img_id3155994\" src=\"cmd/sc_distributerows.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3155994\">Icon</alt></image>"
-msgstr "<image id=\"img_id3155994\" src=\"cmd/sc_distributerows.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3155994\">圖示</alt></image>"
+msgid "<image id=\"img_id3155994\" src=\"cmd/sc_distributerows.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3155994\">Icon Distribute Rows Equally</alt></image>"
+msgstr ""
#. KuUhp
#: 00000405.xhp
@@ -2365,14 +2365,14 @@ msgctxt ""
msgid "On <emph>Table</emph> bar, click"
msgstr ""
-#. Na4rx
+#. UrDQE
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3147555\n"
"help.text"
-msgid "<image id=\"img_id3150361\" src=\"cmd/sc_deleterows.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3150361\">Icon</alt></image>"
-msgstr "<image id=\"img_id3150361\" src=\"cmd/sc_deleterows.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3150361\">圖示</alt></image>"
+msgid "<image id=\"img_id3150361\" src=\"cmd/sc_deleterows.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3150361\">Icon Delete Row</alt></image>"
+msgstr ""
#. EfTgN
#: 00000405.xhp
@@ -2419,14 +2419,14 @@ msgctxt ""
msgid "Open <emph>Optimize Size</emph> toolbar from <emph>Table</emph> bar, click"
msgstr ""
-#. i89K7
+#. WzXMG
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3157881\n"
"help.text"
-msgid "<image id=\"img_id3157888\" src=\"cmd/sc_setoptimalcolumnwidthdirect.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3157888\">Icon</alt></image>"
-msgstr "<image id=\"img_id3157888\" src=\"cmd/sc_setoptimalcolumnwidthdirect.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3157888\">圖示</alt></image>"
+msgid "<image id=\"img_id3157888\" src=\"cmd/sc_setoptimalcolumnwidthdirect.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3157888\">Icon Optimal Column Width</alt></image>"
+msgstr ""
#. iRYb5
#: 00000405.xhp
@@ -2455,14 +2455,14 @@ msgctxt ""
msgid "Open <emph>Optimize Size</emph> toolbar from <emph>Table</emph> bar, click"
msgstr ""
-#. V4Cqu
+#. EPNPB
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3145179\n"
"help.text"
-msgid "<image id=\"img_id3145186\" src=\"cmd/sc_distributecolumns.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3145186\">Icon</alt></image>"
-msgstr "<image id=\"img_id3145186\" src=\"cmd/sc_distributecolumns.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3145186\">圖示</alt></image>"
+msgid "<image id=\"img_id3145186\" src=\"cmd/sc_distributecolumns.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3145186\">Icon Space Column Equally</alt></image>"
+msgstr ""
#. njBSt
#: 00000405.xhp
@@ -2509,14 +2509,14 @@ msgctxt ""
msgid "On <emph>Table</emph> bar, click"
msgstr ""
-#. e5L4N
+#. tY9nN
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3150279\n"
"help.text"
-msgid "<image id=\"img_id3150286\" src=\"cmd/sc_insertcolumns.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3150286\">Icon</alt></image>"
-msgstr "<image id=\"img_id3150286\" src=\"cmd/sc_insertcolumns.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3150286\">圖示</alt></image>"
+msgid "<image id=\"img_id3150286\" src=\"cmd/sc_insertcolumns.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3150286\">Icon Insert Column</alt></image>"
+msgstr ""
#. jeDiz
#: 00000405.xhp
@@ -2527,14 +2527,14 @@ msgctxt ""
msgid "Insert Column"
msgstr "插入欄"
-#. yvgkg
+#. oB4az
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3150895\n"
"help.text"
-msgid "<image id=\"img_id3150902\" src=\"cmd/sc_insertrows.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3150902\">Icon</alt></image>"
-msgstr "<image id=\"img_id3150902\" src=\"cmd/sc_insertrows.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3150902\">圖示</alt></image>"
+msgid "<image id=\"img_id3150902\" src=\"cmd/sc_insertrows.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3150902\">Icon Insert Row</alt></image>"
+msgstr ""
#. MFvHr
#: 00000405.xhp
@@ -2563,14 +2563,14 @@ msgctxt ""
msgid "On <emph>Table</emph> bar, click"
msgstr ""
-#. XqFzq
+#. dedvZ
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3153600\n"
"help.text"
-msgid "<image id=\"img_id3153607\" src=\"cmd/sc_deletecolumns.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3153607\">Icon</alt></image>"
-msgstr "<image id=\"img_id3153607\" src=\"cmd/sc_deletecolumns.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3153607\">圖示</alt></image>"
+msgid "<image id=\"img_id3153607\" src=\"cmd/sc_deletecolumns.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3153607\">Icon Delete Column</alt></image>"
+msgstr ""
#. ro8Mr
#: 00000405.xhp
@@ -2590,13 +2590,13 @@ msgctxt ""
msgid "Choose <emph>Format - Frame and Object - Properties</emph>."
msgstr ""
-#. nsMFC
+#. TR376
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3151276\n"
"help.text"
-msgid "<image id=\"img_id3151283\" src=\"cmd/sc_framedialog.svg\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3151283\"> Icon Object Properties</alt></image>"
+msgid "<image id=\"img_id3151283\" src=\"cmd/sc_framedialog.svg\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3151283\">Icon Object Properties</alt></image>"
msgstr ""
#. vpeBB
@@ -2608,14 +2608,14 @@ msgctxt ""
msgid "Object Properties"
msgstr "物件屬性"
-#. LVQCy
+#. x5EDg
#: 00000405.xhp
msgctxt ""
"00000405.xhp\n"
"par_id3152973\n"
"help.text"
-msgid "<image id=\"img_id3152980\" src=\"cmd/sc_framedialog.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3152980\">Icon</alt></image>"
-msgstr "<image id=\"img_id3152980\" src=\"cmd/sc_framedialog.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3152980\">圖示</alt></image>"
+msgid "<image id=\"img_id3152980\" src=\"cmd/sc_framedialog.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3152980\">Icon Frame Properties</alt></image>"
+msgstr ""
#. CZwgM
#: 00000405.xhp
diff --git a/source/zh-TW/helpcontent2/source/text/swriter/01.po b/source/zh-TW/helpcontent2/source/text/swriter/01.po
index 63aa8d320b5..e9aad4cd47e 100644
--- a/source/zh-TW/helpcontent2/source/text/swriter/01.po
+++ b/source/zh-TW/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-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-20 13:08+0200\n"
"PO-Revision-Date: 2019-08-09 08:03+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4462,14 +4462,14 @@ msgctxt ""
msgid "Insert Manual Break"
msgstr "插入手動隔斷符"
-#. DADdL
+#. FuBqy
#: 04010000.xhp
msgctxt ""
"04010000.xhp\n"
"hd_id3145827\n"
"help.text"
-msgid "Insert Manual Break"
-msgstr "插入手動隔斷符"
+msgid "<variable id=\"ManualBreak_h1\"><link href=\"text/swriter/01/04010000.xhp\" name=\"04010000_link\">Insert Manual Break</link></variable>"
+msgstr ""
#. BMEC5
#: 04010000.xhp
@@ -4597,6 +4597,15 @@ msgctxt ""
msgid "Select the page style for the page that follows the manual page break."
msgstr ""
+#. VGFcT
+#: 04010000.xhp
+msgctxt ""
+"04010000.xhp\n"
+"par_id71633464502255\n"
+"help.text"
+msgid "To switch between landscape and portrait orientation, choose the <emph>Default Page Style</emph> to apply portrait orientation or the <emph>Landscape</emph> style to apply landscape orientation."
+msgstr ""
+
#. iEpne
#: 04010000.xhp
msgctxt ""
@@ -24055,13 +24064,31 @@ msgctxt ""
msgid "Load Styles"
msgstr "載入樣式"
-#. BFL9X
+#. NvMrU
#: 05170000.xhp
msgctxt ""
"05170000.xhp\n"
"hd_id3151242\n"
"help.text"
-msgid "<variable id=\"load_styles_header\"><link href=\"text/swriter/01/05170000.xhp\" name=\"Load Styles\">Load Styles</link></variable>"
+msgid "<switchinline select=\"appl\"> <caseinline select=\"IMPRESS\">Load Master Slide</caseinline> <caseinline select=\"DRAW\">Load Master Page</caseinline> <defaultinline><variable id=\"load_styles_header\"><link href=\"text/swriter/01/05170000.xhp\" name=\"Load Styles\">Load Styles</link></variable></defaultinline> </switchinline>"
+msgstr ""
+
+#. 27Nd8
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"par_id3150717\n"
+"help.text"
+msgid "Load additional slide designs for your presentation."
+msgstr ""
+
+#. 7mftZ
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"par_id2150717\n"
+"help.text"
+msgid "Load additional page designs for your drawing."
msgstr ""
#. FBAJG
@@ -24073,6 +24100,132 @@ msgctxt ""
msgid "<variable id=\"styles_text\"><ahelp hid=\".\">Imports formatting styles from another document or template into the current document.</ahelp></variable>"
msgstr ""
+#. UR6NA
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"hd_id3150327\n"
+"help.text"
+msgid "Categories"
+msgstr ""
+
+#. hfCSA
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"par_id3147338\n"
+"help.text"
+msgid "<ahelp hid=\"sfx/ui/loadtemplatedialog/categories\">Displays the available slide design categories.</ahelp>"
+msgstr ""
+
+#. WGb32
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"hd_id3155962\n"
+"help.text"
+msgid "Templates"
+msgstr ""
+
+#. MVgRk
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"par_id3155337\n"
+"help.text"
+msgid "<ahelp hid=\"sfx/ui/loadtemplatedialog/templates\">Displays the templates for the selected design category.</ahelp>"
+msgstr ""
+
+#. zu7wC
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"hd_id241634052550343\n"
+"help.text"
+msgid "Preview"
+msgstr ""
+
+#. VD5pq
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"par_id3150344\n"
+"help.text"
+msgid "<ahelp hid=\"sfx/ui/loadtemplatedialog/expander\">Shows or hides a preview of a selected master slide.</ahelp>"
+msgstr ""
+
+#. M5edi
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"par_id9159206\n"
+"help.text"
+msgid "Some master slides may not contain visible text objects or drawing objects."
+msgstr ""
+
+#. bFUri
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"hd_id3150427\n"
+"help.text"
+msgid "Categories"
+msgstr ""
+
+#. BhDDL
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"par_id3157338\n"
+"help.text"
+msgid "<ahelp hid=\"sfx/ui/loadtemplatedialog/categories\">Displays the available page design categories.</ahelp>"
+msgstr ""
+
+#. wYRwi
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"hd_id3155952\n"
+"help.text"
+msgid "Templates"
+msgstr ""
+
+#. hjKgq
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"par_id3155837\n"
+"help.text"
+msgid "<ahelp hid=\"sfx/ui/loadtemplatedialog/templates\">Displays the pages designs for the selected design category.</ahelp>"
+msgstr ""
+
+#. FLsVG
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"hd_id241634052520343\n"
+"help.text"
+msgid "Preview"
+msgstr ""
+
+#. APNcz
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"par_id315054\n"
+"help.text"
+msgid "<ahelp hid=\"sfx/ui/loadtemplatedialog/expander\">Shows or hides a preview of a selected page design.</ahelp>"
+msgstr ""
+
+#. fYaPW
+#: 05170000.xhp
+msgctxt ""
+"05170000.xhp\n"
+"par_id3159206\n"
+"help.text"
+msgid "Some page designs may not contain visible text objects or drawing objects."
+msgstr ""
+
#. uooXD
#: 05170000.xhp
msgctxt ""
diff --git a/source/zh-TW/helpcontent2/source/text/swriter/02.po b/source/zh-TW/helpcontent2/source/text/swriter/02.po
index 3c3ffd7aedb..08f9a3ca5ae 100644
--- a/source/zh-TW/helpcontent2/source/text/swriter/02.po
+++ b/source/zh-TW/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-03-29 16:03+0200\n"
+"POT-Creation-Date: 2021-10-25 12:49+0200\n"
"PO-Revision-Date: 2018-02-05 11:41+0000\n"
"Last-Translator: marklh9 <marklh9@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -862,13 +862,13 @@ msgctxt ""
msgid "To remove the numbering restart, apply the command again in the paragraph where the numbering was restarted."
msgstr ""
-#. 7h49d
+#. 4Y7KE
#: 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 - Paragraph - </menuitem><embedvar href=\"text/swriter/01/05030800.xhp#outlinelisth1\"/> tab, select <menuitem>Restart numbering at this paragraph</menuitem> and enter the start number in <menuitem>Start with</menuitem>."
+msgid "To restart numbering with a number greater than 1, right-click in the paragraph where you want to restart numbering, choose <menuitem>Paragraph - Paragraph - </menuitem><link href=\"text/swriter/01/05030800.xhp\" name=\"Numbering_link\">Outline & List</link> tab, select <menuitem>Restart numbering at this paragraph</menuitem> and enter the start number in <menuitem>Start with</menuitem>."
msgstr ""
#. qCdhk
diff --git a/source/zh-TW/helpcontent2/source/text/swriter/guide.po b/source/zh-TW/helpcontent2/source/text/swriter/guide.po
index cf4e7bfa323..a2a9eb3827e 100644
--- a/source/zh-TW/helpcontent2/source/text/swriter/guide.po
+++ b/source/zh-TW/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-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-25 12:49+0200\n"
"PO-Revision-Date: 2020-01-12 06:57+0000\n"
"Last-Translator: Adolfo Jayme Barrientos <fito@libreoffice.org>\n"
"Language-Team: Chinese (Traditional) <https://weblate.documentfoundation.org/projects/libo_help-master/textswriterguide/zh_Hant/>\n"
@@ -43,14 +43,41 @@ msgctxt ""
msgid "<variable id=\"anchor_object\"><link href=\"text/swriter/guide/anchor_object.xhp\" name=\"Positioning Objects\">Positioning Objects</link></variable>"
msgstr "<variable id=\"anchor_object\"><link href=\"text/swriter/guide/anchor_object.xhp\" name=\"定位物件\">定位物件</link></variable>"
-#. PYtpk
+#. ZQbRG
+#: anchor_object.xhp
+msgctxt ""
+"anchor_object.xhp\n"
+"par_id181634295881266\n"
+"help.text"
+msgid "An object, such as an image, is positioned within a document using anchors attached to other elements."
+msgstr ""
+
+#. rrmfz
+#: anchor_object.xhp
+msgctxt ""
+"anchor_object.xhp\n"
+"par_id41634291500513\n"
+"help.text"
+msgid "An anchor determines the reference point for an object. The reference point could be the page or frame where the object is, a paragraph, or even a character. An image always has an anchor and therefore a reference point."
+msgstr ""
+
+#. 2Bkvg
#: anchor_object.xhp
msgctxt ""
"anchor_object.xhp\n"
"par_id3147251\n"
"help.text"
-msgid "You can use anchors to position an object, graphic, or frame in a document. An anchored item remains in place, or moves when you modify the document. The following anchoring options are available:"
-msgstr "您可以使用標號在文件中放置物件、圖形或外框。鎖定的項目位置保持不變,或在您修改文件時移動。可以使用下列鎖定選項:"
+msgid "An anchor moves with the element it is attached to as the document is edited. An object retains it's position relative to the reference point determined by it's anchor, such that, whenever the reference point moves or changes, the object moves relative to it."
+msgstr ""
+
+#. ELWph
+#: anchor_object.xhp
+msgctxt ""
+"anchor_object.xhp\n"
+"par_id441634291545244\n"
+"help.text"
+msgid "The following anchoring options are available:"
+msgstr ""
#. mWome
#: anchor_object.xhp
@@ -79,14 +106,14 @@ msgctxt ""
msgid "As character"
msgstr "作為字元"
-#. AbQya
+#. CjGAr
#: anchor_object.xhp
msgctxt ""
"anchor_object.xhp\n"
"par_id3151181\n"
"help.text"
-msgid "Anchors the selected item as a character in the current text. If the height of the selected item is greater than the current font size, the height of the line containing the item is increased."
-msgstr "在目前的文字中,將選取的項目作為字元鎖定。如果所選項目的高度大於目前的字型大小,則會增加包含此項目的行的高度。"
+msgid "Anchors the selected object as a character in the current text. If the height of the selected object is greater than the current font size, the height of the line containing the object is increased."
+msgstr ""
#. SNGPX
#: anchor_object.xhp
@@ -106,14 +133,23 @@ msgctxt ""
msgid "To character"
msgstr "至字元"
-#. qoghU
+#. 7UsDq
#: anchor_object.xhp
msgctxt ""
"anchor_object.xhp\n"
"par_id3151235\n"
"help.text"
-msgid "Anchors the selected item to a character."
-msgstr "將選取的項目鎖定至字元。"
+msgid "Anchors the selected object to the paragraph that contains the character to which the anchor is attached. The reference point for the object is the start of the paragraph that contains the character."
+msgstr ""
+
+#. Awa37
+#: anchor_object.xhp
+msgctxt ""
+"anchor_object.xhp\n"
+"par_id261634292505179\n"
+"help.text"
+msgid "For example, if you split the paragraph at a point before the anchor, the reference point moves to the start of the new paragraph and the object moves relative to that point. If you join the paragraph to the one before it, the reference point moves to the start of the combined paragraph and the object moves to a position relative to that."
+msgstr ""
#. ekiBZ
#: anchor_object.xhp
@@ -124,14 +160,14 @@ msgctxt ""
msgid "To paragraph"
msgstr "至段落"
-#. EYzAE
+#. F7oaB
#: anchor_object.xhp
msgctxt ""
"anchor_object.xhp\n"
"par_id3155094\n"
"help.text"
-msgid "Anchors the selected item to the current paragraph."
-msgstr "將選取的項目鎖定至目前的段落。"
+msgid "Anchors the selected object to the current paragraph."
+msgstr ""
#. MWaB5
#: anchor_object.xhp
@@ -142,14 +178,14 @@ msgctxt ""
msgid "To page"
msgstr "至頁面"
-#. i5YBs
+#. HnFeA
#: anchor_object.xhp
msgctxt ""
"anchor_object.xhp\n"
"par_id3155144\n"
"help.text"
-msgid "Anchors the selected item to the current page."
-msgstr "將選取的項目鎖定至目前的頁面。"
+msgid "Anchors the selected object to the current page."
+msgstr ""
#. ZEdjj
#: anchor_object.xhp
@@ -169,14 +205,14 @@ msgctxt ""
msgid "Anchors the selected item to the surrounding frame."
msgstr "將選取的項目鎖定至周圍的外框。"
-#. C2FTe
+#. qbj2P
#: anchor_object.xhp
msgctxt ""
"anchor_object.xhp\n"
"par_id3145715\n"
"help.text"
-msgid "When you insert an object, graphic, or frame, an anchor icon appears where the item is anchored. You can position an anchored item by dragging the item to another location. To change the anchoring options of an item, right-click the item, and then choose an option from the <item type=\"menuitem\">Anchor</item> submenu."
-msgstr "插入物件、圖形或外框時,固定項目的位置會顯示 [固定標記] 圖示。您可以將固定的項目拖曳至其他位置以定位該項目。若要變更項目的固定選項,請在此項目上按一下滑鼠右鍵,然後從 <item type=\"menuitem\">[固定標記]</item> 子功能表選擇選項。"
+msgid "When you insert an object, graphic, or frame, an anchor icon appears where the object is anchored. You can move an anchor or, keeping other object constraints in mind, position an object relative to the anchor's reference point by dragging the object. To change the anchoring options of an item, right-click the item, and then choose an option from the <item type=\"menuitem\">Anchor</item> submenu."
+msgstr ""
#. EkgCv
#: arrange_chapters.xhp
@@ -9898,14 +9934,14 @@ msgctxt ""
msgid "Using Styles From Another Document or Template"
msgstr "使用另一個文件或範本中的樣式"
-#. PT73U
+#. Fudzg
#: load_styles.xhp
msgctxt ""
"load_styles.xhp\n"
"bm_id3145086\n"
"help.text"
-msgid "<bookmark_value>formatting styles; importing</bookmark_value> <bookmark_value>styles; importing from other files</bookmark_value> <bookmark_value>importing;styles from other files</bookmark_value> <bookmark_value>loading;styles from other files</bookmark_value>"
-msgstr "<bookmark_value>格式化樣式; 匯入</bookmark_value> <bookmark_value>樣式; 從其他檔案匯入</bookmark_value> <bookmark_value>匯入; 來自其他檔案的樣式</bookmark_value> <bookmark_value>載入; 來自其他檔案的樣式</bookmark_value>"
+msgid "<bookmark_value>formatting styles; importing</bookmark_value> <bookmark_value>styles; importing from other files</bookmark_value> <bookmark_value>importing;styles from other files</bookmark_value> <bookmark_value>loading;styles from other files</bookmark_value>"
+msgstr ""
#. poRMw
#: load_styles.xhp
@@ -9952,13 +9988,13 @@ msgctxt ""
msgid "Choose <emph>View - Styles</emph> or"
msgstr ""
-#. 2YWVV
+#. ECJr5
#: load_styles.xhp
msgctxt ""
"load_styles.xhp\n"
"par_id441529889103330\n"
"help.text"
-msgid "<embedvar href=\"text/swriter/00/stylesmenu.xhp#sms\" markup=\"keep\"/> to open the <emph>Styles</emph> sidebar deck."
+msgid "Choose <emph>Styles - Manage Styles</emph> or <switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline> to open the <emph>Styles</emph> sidebar deck."
msgstr ""
#. mHDNg
@@ -10510,14 +10546,14 @@ msgctxt ""
msgid "Adding Line Numbers"
msgstr "新增行號"
-#. BbESK
+#. DviqV
#: numbering_lines.xhp
msgctxt ""
"numbering_lines.xhp\n"
"bm_id3150101\n"
"help.text"
-msgid "<bookmark_value>line numbers</bookmark_value> <bookmark_value>text; line numbers</bookmark_value> <bookmark_value>paragraphs;line numbers</bookmark_value> <bookmark_value>lines of text; numbering</bookmark_value> <bookmark_value>numbering; lines</bookmark_value> <bookmark_value>numbers; line numbering</bookmark_value> <bookmark_value>marginal numbers on text pages</bookmark_value>"
-msgstr "<bookmark_value>行號</bookmark_value> <bookmark_value>文字; 行號</bookmark_value> <bookmark_value>段落; 行號</bookmark_value> <bookmark_value>文字行; 編號</bookmark_value> <bookmark_value>編號; 行數</bookmark_value> <bookmark_value>編號; 行編號</bookmark_value> <bookmark_value>文字頁面上的旁註號</bookmark_value>"
+msgid "<bookmark_value>line numbers</bookmark_value> <bookmark_value>text; line numbers</bookmark_value> <bookmark_value>paragraphs;line numbers</bookmark_value> <bookmark_value>lines of text; numbering</bookmark_value> <bookmark_value>numbering; lines</bookmark_value> <bookmark_value>numbers; line numbering</bookmark_value> <bookmark_value>marginal numbers on text pages</bookmark_value>"
+msgstr ""
#. qVEcP
#: numbering_lines.xhp
@@ -10609,13 +10645,13 @@ msgctxt ""
msgid "Select <emph>Show numbering</emph>."
msgstr "選取<emph>[顯示編號]</emph>。"
-#. tbCSy
+#. rCniA
#: numbering_lines.xhp
msgctxt ""
"numbering_lines.xhp\n"
"par_id3154248\n"
"help.text"
-msgid "Press <switchinline select=\"sys\"><caseinline select=\"MAC\">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline> to open the <emph>Styles</emph> window, and then click the <emph>Paragraph Styles</emph> icon."
+msgid "Press <switchinline select=\"sys\"><caseinline select=\"MAC\">Command+T </caseinline><defaultinline>F11</defaultinline></switchinline> to open the <emph>Styles</emph> window, and then click the <emph>Paragraph Styles</emph> icon."
msgstr ""
#. Fwn8P
@@ -10780,13 +10816,13 @@ 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>"
-#. PG4ys
+#. RZff6
#: numbering_lines.xhp
msgctxt ""
"numbering_lines.xhp\n"
"par_id3153960\n"
"help.text"
-msgid "Format - Paragraph - <embedvar href=\"text/swriter/01/05030800.xhp#outlinelisth1\"/>"
+msgid "Format - Paragraph - <link href=\"text/swriter/01/05030800.xhp\" name=\"Numbering_link\">Outline & List</link>"
msgstr ""
#. foq8S
@@ -10942,14 +10978,14 @@ msgctxt ""
msgid "Inserting and Deleting Page Breaks"
msgstr "插入與刪除分頁"
-#. jCD3e
+#. 2xdB8
#: page_break.xhp
msgctxt ""
"page_break.xhp\n"
"bm_id3155183\n"
"help.text"
-msgid "<bookmark_value>page breaks; inserting and deleting</bookmark_value> <bookmark_value>inserting; page breaks</bookmark_value> <bookmark_value>deleting;page breaks</bookmark_value> <bookmark_value>pages; inserting/deleting page breaks</bookmark_value> <bookmark_value>manual page breaks</bookmark_value> <bookmark_value>tables;deleting page breaks before</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>inserting; page breaks</bookmark_value> <bookmark_value>deleting;page breaks</bookmark_value> <bookmark_value>pages; inserting/deleting page breaks</bookmark_value> <bookmark_value>manual page breaks</bookmark_value> <bookmark_value>tables;deleting page breaks before</bookmark_value>"
+msgstr ""
#. eCabG
#: page_break.xhp
@@ -11050,14 +11086,23 @@ msgctxt ""
msgid "Clear the <emph>Break</emph> check box."
msgstr "清除<emph>[分頁]</emph>核取方塊。"
-#. xYtzm
+#. TS5bX
#: page_break.xhp
msgctxt ""
"page_break.xhp\n"
-"par_id3154249\n"
+"hd_id151633462071702\n"
"help.text"
-msgid "<link href=\"text/swriter/01/04010000.xhp\" name=\"Insert Break dialog\">Insert Break dialog</link>"
-msgstr "<link href=\"text/swriter/01/04010000.xhp\" name=\"「插入斷行」對話方塊\">「插入斷行」對話方塊</link>"
+msgid "To Quickly Switch Between Portrait and Landscape Page Layout"
+msgstr ""
+
+#. xLfpN
+#: page_break.xhp
+msgctxt ""
+"page_break.xhp\n"
+"par_id121633463140208\n"
+"help.text"
+msgid "Read the help page <link href=\"text/swriter/guide/pageorientation.xhp\" name=\"pageorientation_link\">Changing Page Orientation</link> to learn more about advanced configurations that can be defined concerning page orientation."
+msgstr ""
#. 5GEmu
#: pagebackground.xhp
@@ -11707,14 +11752,14 @@ msgctxt ""
msgid "Changing Page Orientation (Landscape or Portrait)"
msgstr "變更頁面方向 (橫向或縱向)"
-#. 3mWPy
+#. uj4MU
#: pageorientation.xhp
msgctxt ""
"pageorientation.xhp\n"
"bm_id9683828\n"
"help.text"
-msgid "<bookmark_value>page styles;orientation/scope</bookmark_value> <bookmark_value>page formats; changing individual pages</bookmark_value> <bookmark_value>formatting; changing individual pages</bookmark_value> <bookmark_value>portrait and landscape</bookmark_value> <bookmark_value>landscape and portrait</bookmark_value> <bookmark_value>printing;portrait/landscape format</bookmark_value> <bookmark_value>orientation of pages</bookmark_value> <bookmark_value>paper orientation</bookmark_value> <bookmark_value>pages;orientation</bookmark_value> <bookmark_value>sideways orientation of pages</bookmark_value> <bookmark_value>scope of page styles</bookmark_value>"
-msgstr "<bookmark_value>頁面樣式; 方向/範圍</bookmark_value> <bookmark_value>頁面格式; 變更個別頁面</bookmark_value> <bookmark_value>格式; 變更個別頁面</bookmark_value> <bookmark_value>縱向與橫向</bookmark_value> <bookmark_value>橫向與縱向</bookmark_value> <bookmark_value>列印; 縱向/橫向格式</bookmark_value> <bookmark_value>頁面方向</bookmark_value> <bookmark_value>紙張方向</bookmark_value> <bookmark_value>頁面; 方向</bookmark_value> <bookmark_value>頁面兩側方向</bookmark_value> <bookmark_value>頁面樣式範圍</bookmark_value>"
+msgid "<bookmark_value>page styles;orientation/scope</bookmark_value> <bookmark_value>page formats; changing individual pages</bookmark_value> <bookmark_value>formatting; changing individual pages</bookmark_value> <bookmark_value>portrait and landscape</bookmark_value> <bookmark_value>landscape and portrait</bookmark_value> <bookmark_value>printing;portrait/landscape format</bookmark_value> <bookmark_value>orientation of pages</bookmark_value> <bookmark_value>paper orientation</bookmark_value> <bookmark_value>pages;orientation</bookmark_value> <bookmark_value>sideways orientation of pages</bookmark_value> <bookmark_value>scope of page styles</bookmark_value>"
+msgstr ""
#. ETQJ7
#: pageorientation.xhp
@@ -11923,6 +11968,69 @@ msgctxt ""
msgid "Now you have defined a proper page style with the name \"My Landscape\". To apply the new style, double-click the \"My Landscape\" page style in the <emph>Styles</emph> window. All pages in the current scope of page styles will be changed. If you defined the \"next style\" to be a different style, only the first page of the current scope of page styles will be changed."
msgstr ""
+#. bfdGy
+#: pageorientation.xhp
+msgctxt ""
+"pageorientation.xhp\n"
+"hd_id151633462071702\n"
+"help.text"
+msgid "To Quickly Switch Between Portrait and Landscape Page Layout"
+msgstr ""
+
+#. EEW2C
+#: pageorientation.xhp
+msgctxt ""
+"pageorientation.xhp\n"
+"par_id51633462108943\n"
+"help.text"
+msgid "The default template provided by %PRODUCTNAME Writer offers several page layout styles, among which the <emph>Default Page Style</emph> has Portrait orientation and the <emph>Landscape</emph> style has landscape orientation."
+msgstr ""
+
+#. aMkMn
+#: pageorientation.xhp
+msgctxt ""
+"pageorientation.xhp\n"
+"par_id321633462254730\n"
+"help.text"
+msgid "These styles can be used to quickly switch between portrait and landscape orientation by inserting manual breaks and choosing the appropriate page styles as described below:"
+msgstr ""
+
+#. dQpYD
+#: pageorientation.xhp
+msgctxt ""
+"pageorientation.xhp\n"
+"par_id21633462303911\n"
+"help.text"
+msgid "Place the cursor where the page break is to be inserted."
+msgstr ""
+
+#. sTgyV
+#: pageorientation.xhp
+msgctxt ""
+"pageorientation.xhp\n"
+"par_id841633462305362\n"
+"help.text"
+msgid "Go to <menuitem>Insert - More Breaks - Manual Break</menuitem>. The <emph>Insert Break</emph> dialog will open."
+msgstr ""
+
+#. fpcnD
+#: pageorientation.xhp
+msgctxt ""
+"pageorientation.xhp\n"
+"par_id31633462305839\n"
+"help.text"
+msgid "Choose the option <emph>Page break</emph> and in the <emph>Page Style</emph> drop-down list choose the page style to be applied to the page after the break (Default Page Style, Landscape, etc)."
+msgstr ""
+
+#. z3nCn
+#: pageorientation.xhp
+msgctxt ""
+"pageorientation.xhp\n"
+"par_id51633462306574\n"
+"help.text"
+msgid "If the applied has to be changed again at a certain point in the document (for instance, to switch back from landscape to portrait orientation), place the cursor at this point and repeat the steps previously described."
+msgstr ""
+
#. JyqRA
#: pageorientation.xhp
msgctxt ""
@@ -18647,13 +18755,13 @@ msgctxt ""
msgid "Numbering and Paragraph Styles"
msgstr ""
-#. FfEcT
+#. 4rqSe
#: using_numbering.xhp
msgctxt ""
"using_numbering.xhp\n"
"bm_id3155174\n"
"help.text"
-msgid "<bookmark_value>numbering;manually/by styles</bookmark_value><bookmark_value>list styles</bookmark_value><bookmark_value>manual numbering in text</bookmark_value><bookmark_value>paragraph styles;numbering</bookmark_value>"
+msgid "<bookmark_value>numbering;manually/by styles</bookmark_value> <bookmark_value>list styles</bookmark_value> <bookmark_value>manual numbering in text</bookmark_value> <bookmark_value>paragraph styles;numbering</bookmark_value>"
msgstr ""
#. FizBP
@@ -18674,13 +18782,13 @@ msgctxt ""
msgid "You can apply numbering to a paragraph manually or with a paragraph style."
msgstr "您可以手動或使用段落樣式將編號採用到段落中。"
-#. QEp87
+#. iJRcw
#: using_numbering.xhp
msgctxt ""
"using_numbering.xhp\n"
"par_id31616154131555\n"
"help.text"
-msgid "If you want numbered headings, use <menuitem>Tools - </menuitem><embedvar href=\"text/swriter/01/06060000.xhp#ChapNumh1\"/>, instead of numbering manually."
+msgid "If you want numbered headings, use <menuitem>Tools - </menuitem><link href=\"text/swriter/01/06060000.xhp\" name=\"chap_num_link\">Chapter Numbering</link>, instead of numbering manually."
msgstr ""
#. Dh8sW