update translations for master

and force-fix errors using pocheck Change-Id: I1658b92ce4e7a15ad5539e5dcba48bfd1951744f
author: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> 2021-10-04 21:18:14 +0200
committer: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> 2021-10-04 21:20:50 +0200
commit: e8881fe8aa87f07547d433e9fbb82e0e768eb719 (patch)
tree: cd8841438ea6cd00c4047f486da01ebc6aaa781d /source/bo/helpcontent2
parent: 0cb98568b1070b0178a398e2befd36808364e37e (diff)
12 files changed, 1157 insertions, 968 deletions
diff --git a/source/bo/helpcontent2/source/text/sbasic/shared.po b/source/bo/helpcontent2/source/text/sbasic/shared.po
index d1d8bce58e9..b77a5b50201 100644
--- a/source/bo/helpcontent2/source/text/sbasic/shared.po
+++ b/source/bo/helpcontent2/source/text/sbasic/shared.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
 "PO-Revision-Date: 2019-08-09 08:32+0000\n"
 "Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38815,40 +38815,40 @@ msgctxt ""
 msgid "Using <literal>Resume</literal> without parameters to re-execute the faulty instruction can fit certain situations. However that may cause a never ending loop."
 msgstr ""
 
-#. t97uD
+#. DeHMt
 #: calc_functions.xhp
 msgctxt ""
 "calc_functions.xhp\n"
 "tit\n"
 "help.text"
-msgid "Calling Calc Functions in Macros"
+msgid "Using Calc Functions in Macros"
 msgstr ""
 
-#. 3LfzE
+#. B2ErX
 #: calc_functions.xhp
 msgctxt ""
 "calc_functions.xhp\n"
 "bm_id291592361063458\n"
 "help.text"
-msgid "<bookmark_value>calling Calc function;macros</bookmark_value>    <bookmark_value>macros;calling Calc function</bookmark_value>    <bookmark_value>createUNOservice function;calling Calc function</bookmark_value>    <bookmark_value>API;sheet.addin.Analysis</bookmark_value>    <bookmark_value>API;sheet.FunctionAccess</bookmark_value>"
+msgid "<bookmark_value>calling Calc function;macros</bookmark_value>    <bookmark_value>setting Calc function;macros</bookmark_value>    <bookmark_value>macros;calling Calc function</bookmark_value>    <bookmark_value>macros;setting Calc function</bookmark_value>    <bookmark_value>createUNOservice function;calling Calc function</bookmark_value>    <bookmark_value>API;sheet.addin.Analysis</bookmark_value>    <bookmark_value>API;sheet.FunctionAccess</bookmark_value>"
 msgstr ""
 
-#. CSA8o
+#. oDKGc
 #: calc_functions.xhp
 msgctxt ""
 "calc_functions.xhp\n"
 "hd_id91592352089011\n"
 "help.text"
-msgid "<variable id=\"CallingCalcFunctionsh1\"><link href=\"text/sbasic/shared/calc_functions.xhp\" name=\"Calling Calc Functions\">Calling Calc Functions</link></variable>"
+msgid "<variable id=\"CallingCalcFunctionsh1\"><link href=\"text/sbasic/shared/calc_functions.xhp\" name=\"Calling Calc Functions\">Using Calc Functions in Macros</link></variable>"
 msgstr ""
 
-#. DeJyb
+#. vixak
 #: calc_functions.xhp
 msgctxt ""
 "calc_functions.xhp\n"
 "par_id1001592359117987\n"
 "help.text"
-msgid "In addition to the native BASIC functions, you can call Calc functions in your macros and scripts."
+msgid "In addition to the native BASIC functions, you can call Calc functions in your macros and scripts and set Calc functions in cell formulas."
 msgstr ""
 
 #. pFoqw
@@ -38968,6 +38968,51 @@ msgctxt ""
 msgid "' Shows the message \"Disagree\""
 msgstr ""
 
+#. u8bVb
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"hd_id261632673377666\n"
+"help.text"
+msgid "Setting Cell Formulas Containing Internal Calc Functions"
+msgstr ""
+
+#. QAMok
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id41632673385259\n"
+"help.text"
+msgid "Use the formula text string to add a formula to a spreadsheet cell."
+msgstr ""
+
+#. o3jiB
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id291632673370039\n"
+"help.text"
+msgid "All Calc functions must be expressed with their English names."
+msgstr ""
+
+#. dfwfw
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id101632673833258\n"
+"help.text"
+msgid "REM Add a formula to cell A1. Function name must be in English."
+msgstr ""
+
+#. BcaTk
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id191632673837838\n"
+"help.text"
+msgid "REM Cell A1 displays the localized function name"
+msgstr ""
+
 #. V3quU
 #: calc_functions.xhp
 msgctxt ""
@@ -38986,13 +39031,13 @@ msgctxt ""
 msgid "The Calc Add-In functions are in service <literal>com.sun.star.sheet.addin.Analysis</literal>."
 msgstr ""
 
-#. Yrje5
+#. 94wim
 #: calc_functions.xhp
 msgctxt ""
 "calc_functions.xhp\n"
 "bas_id421592358343633\n"
 "help.text"
-msgid "REM Example calling Addin function SQRTPI"
+msgid "REM Example calling Add-in function SQRTPI"
 msgstr ""
 
 #. bFnDA
@@ -39013,6 +39058,51 @@ msgctxt ""
 msgid "MySQRTPI = oService.getSqrtPi(arg)"
 msgstr ""
 
+#. 4Rj5v
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"hd_id251632673972700\n"
+"help.text"
+msgid "Setting Cell Formulas with Add-In Functions"
+msgstr ""
+
+#. wPiTB
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id431632674656090\n"
+"help.text"
+msgid "The Add-In function must be expressed by its UNO service name."
+msgstr ""
+
+#. nUVAe
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id101632623833258\n"
+"help.text"
+msgid "REM Add an Add-In formula to cell A1. Function name is the UNO service name."
+msgstr ""
+
+#. Q6BTa
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"par_id191632673867838\n"
+"help.text"
+msgid "REM Cell A1 displays the localized function name"
+msgstr ""
+
+#. mYEEy
+#: calc_functions.xhp
+msgctxt ""
+"calc_functions.xhp\n"
+"hd_id661632676716180\n"
+"help.text"
+msgid "Add-In Functions UNO service Names"
+msgstr ""
+
 #. PsFhU
 #: calc_functions.xhp
 msgctxt ""
diff --git a/source/bo/helpcontent2/source/text/sbasic/shared/02.po b/source/bo/helpcontent2/source/text/sbasic/shared/02.po
index c4e263f37ae..1033935b23c 100644
--- a/source/bo/helpcontent2/source/text/sbasic/shared/02.po
+++ b/source/bo/helpcontent2/source/text/sbasic/shared/02.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-10 23:11+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
 "PO-Revision-Date: 2019-08-09 08:32+0000\n"
 "Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1177,13 +1177,13 @@ msgctxt ""
 msgid "<image id=\"img_id3146921\" src=\"cmd/sc_radiobutton.png\" width=\"1cm\" height=\"1cm\"><alt id=\"alt_id3146921\">Icon Option Button</alt></image>"
 msgstr ""
 
-#. FWkY8
+#. FNGHF
 #: 20000000.xhp
 msgctxt ""
 "20000000.xhp\n"
 "par_id3153575\n"
 "help.text"
-msgid "<ahelp hid=\".uno:Radiobutton\">Adds a button that allows a user to select from a number of options.</ahelp> Grouped option buttons must have consecutive tab indices. They are commonly encircled by a group box. If you have two groups of option buttons, you must insert a tab index between the tab indices of the two groups on the group frame."
+msgid "<ahelp hid=\".uno:Radiobutton\">Adds a button that allows a user to select from a number of options.</ahelp> Grouped option buttons must have consecutive tab order. They are commonly encircled by a group box. If you have two groups of option buttons, you must insert a tab order between the tab orders of the two groups. For example, to the frame of the second group, or to any other control in the dialog, with the exception of another option button."
 msgstr ""
 
 #. DaRgN
diff --git a/source/bo/helpcontent2/source/text/sbasic/shared/03.po b/source/bo/helpcontent2/source/text/sbasic/shared/03.po
index 9ce692e62bc..66223433598 100644
--- a/source/bo/helpcontent2/source/text/sbasic/shared/03.po
+++ b/source/bo/helpcontent2/source/text/sbasic/shared/03.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
 "PO-Revision-Date: 2018-07-12 14:26+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17170,6 +17170,33 @@ msgctxt ""
 msgid "The name of the currently logged user."
 msgstr ""
 
+#. 9aGdF
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id561633021747903\n"
+"help.text"
+msgid "Yes"
+msgstr ""
+
+#. yuuvA
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id201633021748455\n"
+"help.text"
+msgid "String array"
+msgstr ""
+
+#. BvYt3
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id831633021749007\n"
+"help.text"
+msgid "Returns a zero-based array of strings containing the names of all available fonts."
+msgstr ""
+
 #. Dt7J5
 #: sf_platform.xhp
 msgctxt ""
@@ -17359,6 +17386,15 @@ msgctxt ""
 msgid "This property may return the same value as the <literal>Machine</literal> property."
 msgstr ""
 
+#. FJs9t
+#: sf_platform.xhp
+msgctxt ""
+"sf_platform.xhp\n"
+"par_id311633022159446\n"
+"help.text"
+msgid "The following examples in Basic and Python illustrate how to use the <literal>Fonts</literal> property to write the names of all available fonts to the current Calc sheet starting at cell \"A1\":"
+msgstr ""
+
 #. 3yeMr
 #: sf_platform.xhp
 msgctxt ""
diff --git a/source/bo/helpcontent2/source/text/scalc.po b/source/bo/helpcontent2/source/text/scalc.po
index f46b2c2b5fc..272e02ff794 100644
--- a/source/bo/helpcontent2/source/text/scalc.po
+++ b/source/bo/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-02-08 12:09+0100\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
 "PO-Revision-Date: 2017-05-09 17:17+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -439,15 +439,6 @@ msgctxt ""
 msgid "<link href=\"text/scalc/01/05020000.xhp\" name=\"Cells\">Cells</link>"
 msgstr "<link href=\"text/scalc/01/05020000.xhp\" name=\"དྲ་མིག\">དྲ་མིག</link>"
 
-#. FuTAK
-#: main0105.xhp
-msgctxt ""
-"main0105.xhp\n"
-"hd_id3155087\n"
-"help.text"
-msgid "<link href=\"text/scalc/01/05070000.xhp\" name=\"Page\">Page</link>"
-msgstr "<link href=\"text/scalc/01/05070000.xhp\" name=\"ཤོག་ངོས།\">ཤོག་ངོས།</link>"
-
 #. 2T8EY
 #: main0105.xhp
 msgctxt ""
@@ -637,6 +628,15 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Use the <emph>Data</emph> menu commands to edit the data in the current sheet. You can define ranges, sort and filter the data, calculate results, outline data, and create a pivot table.</ahelp>"
 msgstr ""
 
+#. BDFbQ
+#: main0112.xhp
+msgctxt ""
+"main0112.xhp\n"
+"hd_id231633127579389\n"
+"help.text"
+msgid "<link href=\"text/scalc/01/live_data_stream.xhp\" name=\"Streams_link\">Streams</link>"
+msgstr ""
+
 #. efuyu
 #: main0116.xhp
 msgctxt ""
diff --git a/source/bo/helpcontent2/source/text/scalc/01.po b/source/bo/helpcontent2/source/text/scalc/01.po
index 917ca91ae5a..d23eb021d3e 100644
--- a/source/bo/helpcontent2/source/text/scalc/01.po
+++ b/source/bo/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-09-20 13:02+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
 "PO-Revision-Date: 2019-08-09 08:33+0000\n"
 "Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14938,13 +14938,13 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Converts to euros a currency value expressed in one of the legacy currencies of 19 member states of the European Union, and vice versa.</ahelp> The conversion uses the fixed exchange rates at which the legacy currencies entered the euro."
 msgstr ""
 
-#. 5TXaB
+#. ikuav
 #: 04060106.xhp
 msgctxt ""
 "04060106.xhp\n"
 "par_id581631900947319\n"
 "help.text"
-msgid "We recommend using the more flexible EUROCONVERT function for converting between these currencies."
+msgid "We recommend using the more flexible EUROCONVERT function for converting between these currencies. For converting between many different units of measure, use the CONVERT function."
 msgstr ""
 
 #. ETLYS
@@ -19060,14 +19060,14 @@ msgctxt ""
 msgid "If Type = 0, only exact matches are found. If the search criterion is found more than once, the function returns the index of the first matching value. Only if Type = 0 can you search for regular expressions (if enabled in calculation options) or wildcards (if enabled in calculation options)."
 msgstr ""
 
-#. kxGzq
+#. t3Ems
 #: 04060109.xhp
 msgctxt ""
 "04060109.xhp\n"
 "par_id3147528\n"
 "help.text"
-msgid "If Type = 1 or the third parameter is missing, the index of the last value that is smaller or equal to the search criterion is returned. This applies even when the search array is not sorted. For Type = -1, the first value that is larger or equal is returned."
-msgstr "གལ་སྲིད་ type = 1 འམ་ཞུགས་གྲངས་གསུམ་པ་བཀོད་སྒྲིག་བྱས་མེད་ན་མཐའ་འཇུག་གི་བཤེར་འཚོལ་ལས་ཆུང་བ་མཚུངས་པའི་གྲངས་ཐང་དུ་ཕྱིར་ལོག  ཐ་ན་བཤེར་འཚོལ་གྲངས་ཚོ་གོ་རིམ་སྒྲིག་མེད་ཀྱང་སྔར་བཞིན་སྤྱོད་ཆོག   གལ་སྲིད་ type = -1ཡིན་ན་བཤེར་འཚོལ་གྲངས་ཐང་ལས་ཆེ་བའམ་མཚུངས་པའི་གྲངས་ཐང་དུ་ཕྱིར་ལོག"
+msgid "If Type = 1 or the third parameter is missing, the index of the last value that is smaller or equal to the search criterion is returned. For Type = -1, the first value that is larger or equal is returned."
+msgstr ""
 
 #. eFMjk
 #: 04060109.xhp
@@ -44197,50 +44197,149 @@ msgctxt ""
 msgid "Merge and Center Cells"
 msgstr ""
 
-#. d7KhY
+#. yCXuu
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"bm_id501632012952361\n"
+"help.text"
+msgid "<bookmark_value>toggle merge and center cells</bookmark_value>"
+msgstr ""
+
+#. CQ5ZE
 #: 05060000.xhp
 msgctxt ""
 "05060000.xhp\n"
 "hd_id3149785\n"
 "help.text"
-msgid "<link href=\"text/scalc/01/05060000.xhp\" name=\"Merge and Center Cells\">Merge and Center Cells</link>"
+msgid "<variable id=\"togglemergecells\"><link href=\"text/scalc/01/05060000.xhp\" name=\"Merge and Center Cells\">Merge and Center Cells</link></variable>"
 msgstr ""
 
-#. DaWoE
+#. 8qb5f
 #: 05060000.xhp
 msgctxt ""
 "05060000.xhp\n"
 "par_id3151246\n"
 "help.text"
-msgid "<ahelp hid=\".\">Combines the selected cells into a single cell or splits merged cells. Aligns cell content centered.</ahelp>"
+msgid "<ahelp hid=\".\">This is a toggleable control that joins all cells in a rectangular selection into a single cell, or returns merged cells to the original individual cells. When merging it will format the merged cell as center aligned.</ahelp>"
+msgstr ""
+
+#. b63oA
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id541633057818950\n"
+"help.text"
+msgid "The control is shown toggled-on whenever there are merged cells in the selection, indicating that clicking the control will unmerge those cells."
+msgstr ""
+
+#. MiEGm
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id3153718\n"
+"help.text"
+msgid "Merging cells can lead to calculation errors in formulas in the table."
+msgstr ""
+
+#. fBfnU
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id441632808439621\n"
+"help.text"
+msgid "Do one of the following:"
+msgstr ""
+
+#. bnEwD
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id691632803588118\n"
+"help.text"
+msgid "In the <emph>Formatting</emph> toolbar, click:"
+msgstr ""
+
+#. sq4wv
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id521632804983642\n"
+"help.text"
+msgid "<image id=\"img_id811632804983642\" src=\"cmd/sc_togglemergecells.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id921632804983642\">Icon</alt>    </image>"
+msgstr ""
+
+#. 86yef
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id491632804983642\n"
+"help.text"
+msgid "Merge and Center Cells"
 msgstr ""
 
-#. XHEBx
+#. ZRQSQ
 #: 05060000.xhp
 msgctxt ""
 "05060000.xhp\n"
 "par_id3154020\n"
 "help.text"
-msgid "Choose <emph>Format - Merge Cells - Merge and Center Cells</emph>"
+msgid "Or, choose <variable id=\"format_mergecells_menu\"><menuitem>Format - Merge and Unmerge Cells - </menuitem></variable><menuitem> Merge and Center Cells</menuitem>."
 msgstr ""
 
-#. rpUVk
+#. 8zues
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id3149665\n"
+"help.text"
+msgid "Cells cannot be merged again without first unmerging them."
+msgstr ""
+
+#. Dybs6
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id581632979766784\n"
+"help.text"
+msgid "Merging a cell selection that partially includes merged cells is generally possible with <emph>Unmerge Cells</emph> followed by <emph>Merge Cells</emph>, without altering the initial selection. The result will be largely depend on previous choices when merging cells made with the <emph>Merge Cells Dialog</emph> options described below."
+msgstr ""
+
+#. wNBDD
 #: 05060000.xhp
 msgctxt ""
 "05060000.xhp\n"
 "par_id3148552\n"
 "help.text"
-msgid "The merged cell receives the name of the first cell of the original cell range. Merged cells cannot be merged a second time with other cells. The range must form a rectangle, multiple selection is not supported."
-msgstr "ཟླ་སྒྲིག་བྱས་རྗེས་ཀྱི་དྲ་མིག་གནས་ཡུལ་ཟླ་སྒྲིལ་མ་བྱས་སྔོན་གྱི་དྲ་མིག་ས་ཁོངས་ཀྱི་དྲ་མིག་དང་པོའི་གནས་ཡུལ་ལག་ལེན།  ཟླ་སྒྲིལ་རྗེས་ཀྱི་དྲ་མིག་གཞན་དག་དང་བསྐྱར་དུ་ཟླ་སྒྲིལ་བྱ་མི་རུང་།  དྲ་མིག་ས་ཁོངས་ནི་གྲུ་བཞི་ཁོ་ན་ཙམ་ཡིན་དགོས།"
+msgid "Multiple selection is not supported, that is, the selection must be rectangular."
+msgstr ""
 
-#. HQCwU
+#. XB4aH
 #: 05060000.xhp
 msgctxt ""
 "05060000.xhp\n"
-"par_id3149665\n"
+"par_id211632985508898\n"
+"help.text"
+msgid "The merged cell receives the name and content of the first cell of the selection."
+msgstr ""
+
+#. XRBDv
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id271632985709781\n"
+"help.text"
+msgid "If more than one cell to be merged has content the <emph>Merge Cells</emph> dialog opens."
+msgstr ""
+
+#. QWjJw
+#: 05060000.xhp
+msgctxt ""
+"05060000.xhp\n"
+"par_id391632360383197\n"
 "help.text"
-msgid "If the cells to be merged have any contents, a security dialog is shown."
-msgstr "གལ་ཏེ་ཟླ་སྒྲིལ་དགོས་པའི་དྲ་མིག་ལ་ནང་དོན་འདུས་ཡོད་ན་ཐ་ཚིག་གླེང་སྒྲོམ་ཞིག་མངོན་པར་འགྱུར།"
+msgid "Merge Cells Dialog Options"
+msgstr ""
 
 #. LBMEE
 #: 05060000.xhp
@@ -44278,15 +44377,6 @@ msgctxt ""
 msgid "<emph>Empty the contents of the hidden cells</emph>: <ahelp hid=\".\">The contents of the hidden cells are removed; the results of formulas referring to the hidden cells will be updated.</ahelp>"
 msgstr ""
 
-#. MiEGm
-#: 05060000.xhp
-msgctxt ""
-"05060000.xhp\n"
-"par_id3153718\n"
-"help.text"
-msgid "Merging cells can lead to calculation errors in formulas in the table."
-msgstr ""
-
 #. b8c8c
 #: 05070000.xhp
 msgctxt ""
@@ -44305,14 +44395,14 @@ msgctxt ""
 msgid "<bookmark_value>style;page</bookmark_value><bookmark_value>page;style</bookmark_value><bookmark_value>format;page</bookmark_value><bookmark_value>formatting;page</bookmark_value>"
 msgstr ""
 
-#. YjqDi
+#. Rpt6B
 #: 05070000.xhp
 msgctxt ""
 "05070000.xhp\n"
 "hd_id3157910\n"
 "help.text"
-msgid "Page Style"
-msgstr "ཤོག་ངོས་བཀོད་སྒྲིག"
+msgid "<link href=\"text/scalc/01/05070000.xhp\" name=\"Page Style\">Page Style</link>"
+msgstr ""
 
 #. 4vJrN
 #: 05070000.xhp
@@ -44584,23 +44674,23 @@ msgctxt ""
 msgid "First page number"
 msgstr "ཤོག་ཨང་དང་པོ།"
 
-#. zJPaa
+#. oAziQ
 #: 05070500.xhp
 msgctxt ""
 "05070500.xhp\n"
 "par_id3155378\n"
 "help.text"
-msgid "<ahelp hid=\"modules/scalc/ui/sheetprintpage/checkBTN_PAGENO\">Select this option if you want the first page to start with a number other than 1.</ahelp>"
-msgstr "<ahelp hid=\"modules/scalc/ui/sheetprintpage/checkBTN_PAGENO\">གལ་ཏེ་ཁྱེད་ཀྱིས་འགོ་ཤོག་གི་ཤོག་ཨང་དེ་ 1མིན་པར་འདོད་ན་  འདེམས་གཞི་དེ་འདེམས་དགོས། </ahelp>"
+msgid "<ahelp hid=\"modules/scalc/ui/sheetprintpage/checkBTN_PAGENO\">Select this option if you want this style to restart page numbering.</ahelp>"
+msgstr ""
 
-#. AG8hs
+#. gVwLk
 #: 05070500.xhp
 msgctxt ""
 "05070500.xhp\n"
 "par_id3145389\n"
 "help.text"
-msgid "<ahelp hid=\"modules/scalc/ui/sheetprintpage/spinED_PAGENO\">Enter the number of the first page.</ahelp>"
-msgstr "<ahelp hid=\"modules/scalc/ui/sheetprintpage/spinED_PAGENO\">ཤོག་ལྷེ་དང་པོ་དེ་འདེམས་ཐང་སྒྲོམ་ནང་གཏན་འཁེལ་བྱས་པའི་ཤོག་ཨང་ལ་སྤྱོད་དོ།  </ahelp>"
+msgid "<ahelp hid=\"modules/scalc/ui/sheetprintpage/spinED_PAGENO\">Enter the number you want to restart at.</ahelp>"
+msgstr ""
 
 #. V6Y9R
 #: 05070500.xhp
@@ -44908,14 +44998,14 @@ msgctxt ""
 msgid "Edit Print Ranges"
 msgstr "གཏག་པར་ཁྱབ་ཁོངས་རྩོམ་སྒྲིག"
 
-#. QueLv
+#. JfwDe
 #: 05080300.xhp
 msgctxt ""
 "05080300.xhp\n"
 "par_id3159488\n"
 "help.text"
-msgid "<variable id=\"druckbereichetext\"><ahelp hid=\".uno:EditPrintArea\">Opens a dialog where you can specify the print range.</ahelp></variable> You can also set the rows or columns which are to be repeated in every page."
-msgstr "<variable id=\"druckbereichetext\"><ahelp hid=\".uno:EditPrintArea\">གླེང་སྒྲོམ་ཞིག་འདེམས་ནས་ཁ་ཕྱེ་བའི་ཁྱབ་ཁོངས་གཏན་འཁེལ་བྱེད། </ahelp></variable>ད་དུང་ཤོག་ལྷེ་རེ་རེར་བསྐྱར་ཟློས་སུ་གཏག་པར་དགོས་པའི་ཕྲེང་ངམ་སྟར་བཀོད་སྒྲིག་བྱ་ཐུབ།"
+msgid "<variable id=\"printrangestext\"><ahelp hid=\".uno:EditPrintArea\">Opens a dialog where you can specify the print range.</ahelp></variable> You can also set the rows or columns which are to be repeated in every page."
+msgstr ""
 
 #. eja4j
 #: 05080300.xhp
@@ -45367,78 +45457,6 @@ msgctxt ""
 msgid "<ahelp hid=\"SFX2_HID_TEMPLATE_FILTER\">Lists the available style groups.</ahelp>"
 msgstr ""
 
-#. Gmpzb
-#: 05100100.xhp
-msgctxt ""
-"05100100.xhp\n"
-"tit\n"
-"help.text"
-msgid "Merge Cells"
-msgstr "དྲ་མིག་ཟླ་སྒྲིལ།"
-
-#. 4JtKL
-#: 05100100.xhp
-msgctxt ""
-"05100100.xhp\n"
-"hd_id3154765\n"
-"help.text"
-msgid "Merge Cells"
-msgstr "དྲ་མིག་ཟླ་སྒྲིལ།"
-
-#. BHmTE
-#: 05100100.xhp
-msgctxt ""
-"05100100.xhp\n"
-"par_id3147406\n"
-"help.text"
-msgid "<ahelp hid=\".\">Combines the contents of the selected cells into a single cell.</ahelp>"
-msgstr ""
-
-#. AP2s7
-#: 05100100.xhp
-msgctxt ""
-"05100100.xhp\n"
-"par_id3154351\n"
-"help.text"
-msgid "Choose <emph>Format - Merge Cells - Merge Cells</emph>"
-msgstr ""
-
-#. pfYCj
-#: 05100200.xhp
-msgctxt ""
-"05100200.xhp\n"
-"tit\n"
-"help.text"
-msgid "Split Cells"
-msgstr "དྲ་མིག་དབྱེ་འཕྲལ།"
-
-#. ZTsK9
-#: 05100200.xhp
-msgctxt ""
-"05100200.xhp\n"
-"hd_id3154654\n"
-"help.text"
-msgid "Split Cells"
-msgstr "དྲ་མིག་དབྱེ་འཕྲལ།"
-
-#. omMdA
-#: 05100200.xhp
-msgctxt ""
-"05100200.xhp\n"
-"par_id3083451\n"
-"help.text"
-msgid "<ahelp hid=\".\">Splits previously merged cells.</ahelp>"
-msgstr ""
-
-#. ic7Vk
-#: 05100200.xhp
-msgctxt ""
-"05100200.xhp\n"
-"par_id3154023\n"
-"help.text"
-msgid "Choose <emph>Format - Merge Cells - Split Cells</emph>"
-msgstr ""
-
 #. MiWuG
 #: 05110000.xhp
 msgctxt ""
@@ -48688,22 +48706,22 @@ msgctxt ""
 msgid "<ahelp hid=\"modules/scalc/ui/sortoptionspage/leftright\"> Sorts columns by the values in the active rows of the selected range.</ahelp>"
 msgstr "<ahelp hid=\"modules/scalc/ui/sortoptionspage/leftright\">བདམས་པའི་ས་ཁོངས་ནང་  བྱ་འགུལ་ཕྲེང་ནང་གི་གྲངས་ཐང་ལ་གཞིགས་ནས་སྟར་ལ་རིམ་སྒྲིག་བྱེད།   </ahelp>"
 
-#. a8dw2
+#. MzEHk
 #: 12040000.xhp
 msgctxt ""
 "12040000.xhp\n"
 "tit\n"
 "help.text"
-msgid "Filter"
-msgstr "འཚགས་འདེམས།"
+msgid "More Filters"
+msgstr ""
 
-#. A3xBE
+#. EtYTd
 #: 12040000.xhp
 msgctxt ""
 "12040000.xhp\n"
 "hd_id3150767\n"
 "help.text"
-msgid "<link href=\"text/scalc/01/12040000.xhp\" name=\"Filter\">Filters</link>"
+msgid "<link href=\"text/scalc/01/12040000.xhp\" name=\"Filter\">More Filters</link>"
 msgstr ""
 
 #. PgpNB
@@ -48715,14 +48733,14 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Shows commands to filter your data.</ahelp>"
 msgstr ""
 
-#. ipXuZ
+#. nGCni
 #: 12040000.xhp
 msgctxt ""
 "12040000.xhp\n"
-"par_id3146119\n"
+"par_id911633127394220\n"
 "help.text"
-msgid "$[officename] automatically recognizes predefined database ranges."
-msgstr "$[officename] རང་འགུལ་གྱིས་སྔོན་བཀོད་ཀྱི་གཞི་གྲངས་མཛོད་ས་ཁོངས་ཤན་འབྱེད་བྱ་ཐུབ།"
+msgid "%PRODUCTNAME automatically recognizes predefined database ranges."
+msgstr ""
 
 #. 7khnq
 #: 12040000.xhp
@@ -67183,13 +67201,13 @@ msgctxt ""
 msgid "Live Data Stream"
 msgstr ""
 
-#. iithi
+#. GvEyi
 #: live_data_stream.xhp
 msgctxt ""
 "live_data_stream.xhp\n"
 "bm_id240920171018528200\n"
 "help.text"
-msgid "<bookmark_value>Data Stream;Live data stream</bookmark_value>"
+msgid "<bookmark_value>Data Stream;Live data stream</bookmark_value>    <bookmark_value>Data Stream;Streams</bookmark_value>"
 msgstr ""
 
 #. bn3r4
@@ -67201,31 +67219,31 @@ msgctxt ""
 msgid "<link href=\"text/scalc/01/live_data_stream.xhp\">Live Data Stream</link>"
 msgstr ""
 
-#. mND9J
+#. mB9BH
 #: live_data_stream.xhp
 msgctxt ""
 "live_data_stream.xhp\n"
 "par_id240920171003293400\n"
 "help.text"
-msgid "<ahelp hid=\".\">Live data stream for spreadsheets</ahelp>"
+msgid "<ahelp hid=\".\"><variable id=\"streams_desc\">Create live data streams for spreadsheets.</variable></ahelp>"
 msgstr ""
 
-#. DBAjA
+#. Zsu3z
 #: live_data_stream.xhp
 msgctxt ""
 "live_data_stream.xhp\n"
 "par_id240920171007389295\n"
 "help.text"
-msgid "Menu <item type=\"menuitem\">Data – Streams...</item>"
+msgid "Menu <menuitem>Data – Streams...</menuitem>"
 msgstr ""
 
-#. FYDzo
+#. JT47J
 #: live_data_stream.xhp
 msgctxt ""
 "live_data_stream.xhp\n"
-"par_id240920171007419799\n"
+"par_id921633126951835\n"
 "help.text"
-msgid "Data streams"
+msgid "This is an experimental feature and is disabled by default. To enable it, go to <menuitem>Tools - Options - Advanced</menuitem>  and check the option <emph>Enable experimental features (may be unstable)</emph>."
 msgstr ""
 
 #. k7H5Y
diff --git a/source/bo/helpcontent2/source/text/scalc/guide.po b/source/bo/helpcontent2/source/text/scalc/guide.po
index ba7b9b0289f..35392406563 100644
--- a/source/bo/helpcontent2/source/text/scalc/guide.po
+++ b/source/bo/helpcontent2/source/text/scalc/guide.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
 "PO-Revision-Date: 2018-11-14 11:52+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12058,40 +12058,40 @@ msgctxt ""
 msgid "<link href=\"text/shared/01/05020500.xhp\" name=\"Context menu - Character - Font Position\">Context menu - Character - Font Position</link>"
 msgstr "<link href=\"text/shared/01/05020500.xhp\" name=\"གནས་ས།\">གནས་ས།</link>"
 
-#. 6YCYG
+#. 2wVQM
 #: table_cellmerge.xhp
 msgctxt ""
 "table_cellmerge.xhp\n"
 "tit\n"
 "help.text"
-msgid "Merging and Splitting Cells"
+msgid "Merge and Unmerge Cells"
 msgstr ""
 
-#. v5UNn
+#. AEABz
 #: table_cellmerge.xhp
 msgctxt ""
 "table_cellmerge.xhp\n"
-"bm_id3147240\n"
+"bm_id501632012952361\n"
 "help.text"
-msgid "<bookmark_value>cells; merging/unmerging</bookmark_value>      <bookmark_value>tables; merging cells</bookmark_value>      <bookmark_value>cell merges</bookmark_value>      <bookmark_value>unmerging cells</bookmark_value>      <bookmark_value>splitting cells</bookmark_value>      <bookmark_value>merging;cells</bookmark_value>"
+msgid "<bookmark_value>merge/merging cells</bookmark_value>      <bookmark_value>unmerge/unmerging cells</bookmark_value>      <bookmark_value>split/splitting cells</bookmark_value>"
 msgstr ""
 
-#. 5x2y9
+#. BAqR3
 #: table_cellmerge.xhp
 msgctxt ""
 "table_cellmerge.xhp\n"
 "hd_id8005005\n"
 "help.text"
-msgid "<variable id=\"table_cellmerge\"><link href=\"text/scalc/guide/table_cellmerge.xhp\" name=\"Merging and Unmerging Cells\">Merging and Unmerging Cells</link></variable>"
+msgid "<variable id=\"table_cellmerge\"><link href=\"text/scalc/guide/table_cellmerge.xhp\" name=\"Merging and Unmerging Cells\">Merge and Unmerge Cells</link></variable>"
 msgstr ""
 
-#. HBXMn
+#. Hht67
 #: table_cellmerge.xhp
 msgctxt ""
 "table_cellmerge.xhp\n"
 "par_id8049867\n"
 "help.text"
-msgid "You can select adjacent cells, then merge them into a single cell. Conversely, you can take a large cell that has been created by merging single cells, and divide it back into individual cells."
+msgid "You can select a range of cells, then merge them into a single cell. Conversely, you can take a previously merged cell and divide it back into individual cells."
 msgstr ""
 
 #. vFF3v
@@ -12103,58 +12103,139 @@ msgctxt ""
 msgid "When you copy cells into a target range containing merged cells, the target range gets unmerged first, then the copied cells are pasted in. If the copied cells are merged cells, they retain their merge state."
 msgstr ""
 
-#. 8fYAs
+#. F4ADr
 #: table_cellmerge.xhp
 msgctxt ""
 "table_cellmerge.xhp\n"
 "hd_id235602\n"
 "help.text"
-msgid "Merging Cells"
+msgid "Merge Cells"
 msgstr ""
 
-#. rg5VD
+#. PhwAW
 #: table_cellmerge.xhp
 msgctxt ""
 "table_cellmerge.xhp\n"
 "par_id1272927\n"
 "help.text"
-msgid "Select the adjacent cells."
+msgid "Click and drag to select the cells to be merged then do one of the following:"
 msgstr ""
 
-#. tw3g2
+#. BpCih
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id221632803290526\n"
+"help.text"
+msgid "In the Formatting toolbar click:"
+msgstr ""
+
+#. tc6Dw
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id3154351\n"
+"help.text"
+msgid "Or, right click the selection to open the context menu and choose <menuitem>Merge Cells</menuitem>.<br/>If <menuitem>Unmerge Cells</menuitem> is present instead then the cell selection contains merged cells and cannot be merged further."
+msgstr ""
+
+#. uH6dA
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id931632803442925\n"
+"help.text"
+msgid "Or, in the <emph>Properties</emph> sidebar mark the <emph>Merge Cells</emph> checkbox."
+msgstr ""
+
+#. dzAEu
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id3154020\n"
+"help.text"
+msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Merge Cells</menuitem>"
+msgstr ""
+
+#. DbZBM
 #: table_cellmerge.xhp
 msgctxt ""
 "table_cellmerge.xhp\n"
 "par_id6424146\n"
 "help.text"
-msgid "Choose <emph>Format - Merge Cells - Merge Cells</emph>. If you choose <emph>Format - Merge Cells - Merge and Center Cells</emph>, the cell content will be centered in the merged cell."
+msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Merge and Center Cells</menuitem>"
 msgstr ""
 
-#. sRSSD
+#. sHLpi
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id961632012538771\n"
+"help.text"
+msgid "The cells will be merged and the content will be centered in the merged cell."
+msgstr ""
+
+#. ULMQA
 #: table_cellmerge.xhp
 msgctxt ""
 "table_cellmerge.xhp\n"
 "hd_id451368\n"
 "help.text"
-msgid "Splitting Cells"
+msgid "Unmerge Cells"
 msgstr ""
 
-#. HBYzb
+#. 2xrnM
 #: table_cellmerge.xhp
 msgctxt ""
 "table_cellmerge.xhp\n"
 "par_id7116611\n"
 "help.text"
-msgid "Place the cursor in the cell to be split."
+msgid "Select the cell to be unmerged, or a selection that includes the cells to be unmerged then do one of the following:"
+msgstr ""
+
+#. CmALo
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id581632820903635\n"
+"help.text"
+msgid "In the Formatting toolbar, click:"
 msgstr ""
 
-#. 3iQKf
+#. 4TYCy
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id431632277778130\n"
+"help.text"
+msgid "Or, right click the selection to open the context menu and choose <menuitem>Unmerge Cells</menuitem>.<br/>If <menuitem>Merge Cells</menuitem> is present instead then the selection does not contain any merged cells."
+msgstr ""
+
+#. LrAis
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id261632277824041\n"
+"help.text"
+msgid "Or, in the <emph>Properties</emph> sidebar clear the <emph>Merge Cells</emph> checkbox."
+msgstr ""
+
+#. zBdRG
 #: table_cellmerge.xhp
 msgctxt ""
 "table_cellmerge.xhp\n"
 "par_id9493087\n"
 "help.text"
-msgid "Choose <emph>Format - Merge Cells - Split Cells</emph>."
+msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Unmerge Cells</menuitem>."
+msgstr ""
+
+#. YC7sa
+#: table_cellmerge.xhp
+msgctxt ""
+"table_cellmerge.xhp\n"
+"par_id561632820960500\n"
+"help.text"
+msgid "Or, toggle <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Merge and Center Cells</menuitem>"
 msgstr ""
 
 #. u5xXE
diff --git a/source/bo/helpcontent2/source/text/sdatabase.po b/source/bo/helpcontent2/source/text/sdatabase.po
index d4c89e03cfd..54c74d1b578 100644
--- a/source/bo/helpcontent2/source/text/sdatabase.po
+++ b/source/bo/helpcontent2/source/text/sdatabase.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-10 23:11+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6061,13 +6061,13 @@ msgctxt ""
 msgid "Special Settings"
 msgstr ""
 
-#. JBUZ3
+#. pCkAh
 #: dabaadvpropdat.xhp
 msgctxt ""
 "dabaadvpropdat.xhp\n"
 "bm_id81623155177507\n"
 "help.text"
-msgid "<bookmark_value>database;special settings</bookmark_value>         <bookmark_value>database settings;SQL92 naming</bookmark_value>         <bookmark_value>database settings;keyword AS</bookmark_value>         <bookmark_value>database settings;outer join syntax</bookmark_value>         <bookmark_value>database settings;special SELECT statements</bookmark_value>         <bookmark_value>database settings;ODBC date/time</bookmark_value>         <bookmark_value>database settings;support primary keys</bookmark_value>         <bookmark_value>database settings;line ends</bookmark_value>         <bookmark_value>database settings;version columns</bookmark_value>"
+msgid "<bookmark_value>database;special settings</bookmark_value><bookmark_value>database settings;SQL92 naming</bookmark_value><bookmark_value>database settings;keyword AS</bookmark_value><bookmark_value>database settings;outer join syntax</bookmark_value><bookmark_value>database settings;special SELECT statements</bookmark_value><bookmark_value>database settings;ODBC date/time</bookmark_value><bookmark_value>database settings;support primary keys</bookmark_value><bookmark_value>database settings;line ends</bookmark_value><bookmark_value>database settings;version columns</bookmark_value>"
 msgstr ""
 
 #. vCApF
@@ -6124,58 +6124,40 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Only allows characters that conform to the SQL92 naming convention in a name in a data source. All other characters are rejected. Each name must begin with a lowercase letter, an uppercase letter, or an underscore ( _ ). The remaining characters can be ASCII letters, numbers, and underscores.</ahelp>"
 msgstr ""
 
-#. wHaBn
-#: dabaadvpropdat.xhp
-msgctxt ""
-"dabaadvpropdat.xhp\n"
-"par_idN105907\n"
-"help.text"
-msgid "Use keyword AS before table alias names"
-msgstr ""
-
-#. xEpbm
-#: dabaadvpropdat.xhp
-msgctxt ""
-"dabaadvpropdat.xhp\n"
-"par_idN105947\n"
-"help.text"
-msgid "<ahelp hid=\".\">Some databases use the keyword \"AS\" between a name and its alias, while other databases use a whitespace. Enable this option to insert AS before the alias.</ahelp>"
-msgstr ""
-
-#. NbAt4
+#. UDWZ7
 #: dabaadvpropdat.xhp
 msgctxt ""
 "dabaadvpropdat.xhp\n"
-"hd_id3534958\n"
+"par_idN1059E\n"
 "help.text"
-msgid "End text lines with CR + LF"
+msgid "Append the table alias name in SELECT statements"
 msgstr ""
 
-#. NKKsC
+#. v2ZEZ
 #: dabaadvpropdat.xhp
 msgctxt ""
 "dabaadvpropdat.xhp\n"
-"par_id6151921\n"
+"par_idN105A2\n"
 "help.text"
-msgid "<ahelp hid=\".\">Select to use the CR + LF code pair to end every text line (preferred for DOS and Windows operating systems).</ahelp>"
+msgid "<ahelp hid=\".\">Appends the alias to the table name in SELECT statements.</ahelp>"
 msgstr ""
 
-#. UDWZ7
+#. wHaBn
 #: dabaadvpropdat.xhp
 msgctxt ""
 "dabaadvpropdat.xhp\n"
-"par_idN1059E\n"
+"par_idN105907\n"
 "help.text"
-msgid "Append the table alias name in SELECT statements"
+msgid "Use keyword AS before table alias names"
 msgstr ""
 
-#. v2ZEZ
+#. xEpbm
 #: dabaadvpropdat.xhp
 msgctxt ""
 "dabaadvpropdat.xhp\n"
-"par_idN105A2\n"
+"par_idN105947\n"
 "help.text"
-msgid "<ahelp hid=\".\">Appends the alias to the table name in SELECT statements.</ahelp>"
+msgid "<ahelp hid=\".\">Some databases use the keyword \"AS\" between a name and its alias, while other databases use a whitespace. Enable this option to insert AS before the alias.</ahelp>"
 msgstr ""
 
 #. 6kz2C
@@ -6322,76 +6304,76 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Creates an index with ASC or DESC statements.</ahelp>"
 msgstr ""
 
-#. BzVqp
+#. NbAt4
 #: dabaadvpropdat.xhp
 msgctxt ""
 "dabaadvpropdat.xhp\n"
-"par_idN10621\n"
+"hd_id3534958\n"
 "help.text"
-msgid "Comparison of Boolean values"
+msgid "End text lines with CR + LF"
 msgstr ""
 
-#. rgzfK
+#. NKKsC
 #: dabaadvpropdat.xhp
 msgctxt ""
 "dabaadvpropdat.xhp\n"
-"par_idN10625\n"
+"par_id6151921\n"
 "help.text"
-msgid "<ahelp hid=\".\">Select the type of Boolean comparison that you want to use.</ahelp>"
+msgid "<ahelp hid=\".\">Select to use the CR + LF code pair to end every text line (preferred for DOS and Windows operating systems).</ahelp>"
 msgstr ""
 
-#. X2cuQ
+#. T9wrt
 #: dabaadvpropdat.xhp
 msgctxt ""
 "dabaadvpropdat.xhp\n"
-"hd_id1101718\n"
+"hd_id0909200811170166\n"
 "help.text"
-msgid "Form data input checks for required fields"
+msgid "Ignore currency field information"
 msgstr ""
 
-#. 8FD9D
+#. MWpZD
 #: dabaadvpropdat.xhp
 msgctxt ""
 "dabaadvpropdat.xhp\n"
-"par_id3783989\n"
+"par_id0909200811170221\n"
 "help.text"
-msgid "<ahelp hid=\".\">When you enter a new record or update an existing record in a form, and you leave a field empty which is bound to a database column which requires input, then you will see a message complaining about the empty field.</ahelp>"
+msgid "<ahelp hid=\".\">Only for Oracle JDBC connections. When enabled it specifies that no column is treated as a currency field. The field type returned from the database driver is discarded.</ahelp>"
 msgstr ""
 
-#. LPJKD
+#. X2cuQ
 #: dabaadvpropdat.xhp
 msgctxt ""
 "dabaadvpropdat.xhp\n"
-"par_id6684163\n"
+"hd_id1101718\n"
 "help.text"
-msgid "If this control box is not enabled, then the forms in the current database will not be checked for required fields."
+msgid "Form data input checks for required fields"
 msgstr ""
 
-#. fZAwm
+#. 8FD9D
 #: dabaadvpropdat.xhp
 msgctxt ""
 "dabaadvpropdat.xhp\n"
-"par_id3837397\n"
+"par_id3783989\n"
 "help.text"
-msgid "The control box is available for all data source types which support write access to their data. The control box does not exist for spreadsheets, text, csv, and the various read-only address books."
+msgid "<ahelp hid=\".\">When you enter a new record or update an existing record in a form, and you leave a field empty which is bound to a database column which requires input, then you will see a message complaining about the empty field.</ahelp>"
 msgstr ""
 
-#. T9wrt
+#. LPJKD
 #: dabaadvpropdat.xhp
 msgctxt ""
 "dabaadvpropdat.xhp\n"
-"hd_id0909200811170166\n"
+"par_id6684163\n"
 "help.text"
-msgid "Ignore currency field information"
+msgid "If this control box is not enabled, then the forms in the current database will not be checked for required fields."
 msgstr ""
 
-#. MWpZD
+#. fZAwm
 #: dabaadvpropdat.xhp
 msgctxt ""
 "dabaadvpropdat.xhp\n"
-"par_id0909200811170221\n"
+"par_id3837397\n"
 "help.text"
-msgid "<ahelp hid=\".\">Only for Oracle JDBC connections. When enabled it specifies that no column is treated as a currency field. The field type returned from the database driver is discarded.</ahelp>"
+msgid "The control box is available for all data source types which support write access to their data. The control box does not exist for spreadsheets, text, csv, and the various read-only address books."
 msgstr ""
 
 #. ykjaM
@@ -6457,6 +6439,60 @@ msgctxt ""
 msgid "Note that if this option is just for overruling the heuristics. If you enable the check box for a database which actually does not support primary keys, you will see some errors."
 msgstr ""
 
+#. SbhkD
+#: dabaadvpropdat.xhp
+msgctxt ""
+"dabaadvpropdat.xhp\n"
+"hd_id621632736570505\n"
+"help.text"
+msgid "Respect the result set type from the database driver"
+msgstr ""
+
+#. EZkMC
+#: dabaadvpropdat.xhp
+msgctxt ""
+"dabaadvpropdat.xhp\n"
+"par_id641632755407673\n"
+"help.text"
+msgid "Use the database driver different scroll capabilities of a result set. Refer to <link href=\"https://api.libreoffice.org/docs/idl/ref/namespacecom_1_1sun_1_1star_1_1sdbc_1_1ResultSetType.html\" name=\"ResultSetType\">ResultSetType Constant Group</link>"
+msgstr ""
+
+#. BzVqp
+#: dabaadvpropdat.xhp
+msgctxt ""
+"dabaadvpropdat.xhp\n"
+"par_idN10621\n"
+"help.text"
+msgid "Comparison of Boolean values"
+msgstr ""
+
+#. rgzfK
+#: dabaadvpropdat.xhp
+msgctxt ""
+"dabaadvpropdat.xhp\n"
+"par_idN10625\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select the type of Boolean comparison that you want to use.</ahelp>"
+msgstr ""
+
+#. CAkyk
+#: dabaadvpropdat.xhp
+msgctxt ""
+"dabaadvpropdat.xhp\n"
+"hd_id421632739992940\n"
+"help.text"
+msgid "Rows to scan columns types"
+msgstr ""
+
+#. nC3qS
+#: dabaadvpropdat.xhp
+msgctxt ""
+"dabaadvpropdat.xhp\n"
+"par_id541632740596622\n"
+"help.text"
+msgid "Select the number of rows to let the driver detect the data type."
+msgstr ""
+
 #. EYaFK
 #: dabaadvpropgen.xhp
 msgctxt ""
@@ -7465,6 +7501,474 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Select a database from the list or click <emph>Create</emph> to create a new database.</ahelp>"
 msgstr ""
 
+#. BhD6X
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"tit\n"
+"help.text"
+msgid "Database Wizard"
+msgstr ""
+
+#. dYT7e
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"bm_id2026429\n"
+"help.text"
+msgid "<bookmark_value>wizards;databases (Base)</bookmark_value><bookmark_value>Database Wizard (Base)</bookmark_value><bookmark_value>databases; formats (Base)</bookmark_value><bookmark_value>MySQL databases (Base)</bookmark_value><bookmark_value>MariaDB databases (Base)</bookmark_value><bookmark_value>dBASE; database settings (Base)</bookmark_value><bookmark_value>jdbc; database settings (Base)</bookmark_value><bookmark_value>odbc; database settings (Base)</bookmark_value><bookmark_value>spreadsheets;as databases (base)</bookmark_value>"
+msgstr ""
+
+#. 5pnX6
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN105B4\n"
+"help.text"
+msgid "<variable id=\"databasewizardh1\"><link href=\"text/sdatabase/dabawiz00.xhp\">Database Wizard</link></variable>"
+msgstr ""
+
+#. 4L7fe
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_id9856563\n"
+"help.text"
+msgid "The Database Wizard creates a <link href=\"text/sdatabase/dabadoc.xhp\">database file</link> that contains information about a database."
+msgstr ""
+
+#. MP58w
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN105D5\n"
+"help.text"
+msgid "Depending on the type of operation and the type of database, the Database Wizard consists of a varying number of steps."
+msgstr ""
+
+#. BvAbd
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN105DB\n"
+"help.text"
+msgid "If you create a new database file, the wizard contains two steps."
+msgstr ""
+
+#. 75qWp
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN105DF\n"
+"help.text"
+msgid "If you open the Database Wizard to create a database file for an existing database connection, there may be more steps to specify paths, authentication information, and more."
+msgstr ""
+
+#. wFFQE
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN105F2\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">Set up text file connection</link>"
+msgstr ""
+
+#. 73X5w
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN10601\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">Set up Microsoft Access connection</link>"
+msgstr ""
+
+#. ckemB
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN1062E\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">Set up ADO connection</link>"
+msgstr ""
+
+#. bbTEe
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN1070F\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02dbase.xhp\">Set up dBASE connection</link>"
+msgstr ""
+
+#. mM3XM
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN1063D\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">Set up JDBC connection</link>"
+msgstr ""
+
+#. EB2yp
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN1064C\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">Set up Oracle database connection</link>"
+msgstr ""
+
+#. sSrMX
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN1066A\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC settings</link>"
+msgstr ""
+
+#. Jht8w
+#: dabawiz00.xhp
+msgctxt ""
+"dabawiz00.xhp\n"
+"par_idN10679\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02spreadsheet.xhp\">Set up Spreadsheet connection</link>"
+msgstr ""
+
+#. menWz
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"tit\n"
+"help.text"
+msgid "Database Selection"
+msgstr ""
+
+#. cE94h
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"bm_id2082583\n"
+"help.text"
+msgid "<bookmark_value>databases; connecting (Base)</bookmark_value>"
+msgstr ""
+
+#. 6LQ8F
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1054D\n"
+"help.text"
+msgid "<variable id=\"databaseselectionh1\"><link href=\"text/sdatabase/dabawiz01.xhp\">Select Database</link></variable>"
+msgstr ""
+
+#. MNcgG
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1055D\n"
+"help.text"
+msgid "<ahelp hid=\".\">Creates a new database, opens a database file, or connects to an existing database.</ahelp>"
+msgstr ""
+
+#. 3gKji
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10585\n"
+"help.text"
+msgid "Create a new database"
+msgstr ""
+
+#. QsxqK
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10589\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select to create a new database. </ahelp>This option uses the HSQL database engine with default settings. The final page of the wizard appears next."
+msgstr ""
+
+#. FMbMQ
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_id8584246\n"
+"help.text"
+msgid "<link href=\"http://hsqldb.org/\">External web page about HSQL</link>."
+msgstr ""
+
+#. RzgCQ
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN105F9\n"
+"help.text"
+msgid "Open an existing database file"
+msgstr ""
+
+#. SrmuV
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN105FD\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select to open a database file from a list of recently used files or from a file selection dialog.</ahelp>"
+msgstr ""
+
+#. HNAd8
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10614\n"
+"help.text"
+msgid "Recently used"
+msgstr ""
+
+#. ZGuNR
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10618\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select a database file to open from the list of recently used files. Click Finish to open the file immediately and to exit the wizard.</ahelp>"
+msgstr ""
+
+#. ACzer
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1062F\n"
+"help.text"
+msgid "Open"
+msgstr ""
+
+#. 9WBfN
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10633\n"
+"help.text"
+msgid "<ahelp hid=\".\">Opens a file selection dialog where you can select a database file. Click Open or OK in the file selection dialog to open the file immediately and to exit the wizard.</ahelp>"
+msgstr ""
+
+#. rLwWT
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1058C\n"
+"help.text"
+msgid "Connect to an existing database"
+msgstr ""
+
+#. tF4HK
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10590\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select to create a database document for an existing database connection.</ahelp>"
+msgstr ""
+
+#. M4MGu
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10593\n"
+"help.text"
+msgid "Database type"
+msgstr ""
+
+#. jypBq
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10597\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select the database type for the existing database connection.</ahelp>"
+msgstr ""
+
+#. xNvnU
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1059A\n"
+"help.text"
+msgid "The Outlook, Evolution, KDE Address Book, and Seamonkey database types do not need additional information. For other database types, the wizard contains additional pages to specify the required information."
+msgstr ""
+
+#. 4RN7W
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10611\n"
+"help.text"
+msgid "The next wizard page is one of the following pages:"
+msgstr ""
+
+#. vaBGS
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1061C\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">Set up text file connection</link>"
+msgstr ""
+
+#. NEWQn
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1062B\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">Set up Microsoft Access or Microsoft Access 2007 connection</link>"
+msgstr ""
+
+#. NCWx8
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN1063A\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02ldap.xhp\">Set up LDAP connection</link>"
+msgstr ""
+
+#. 29mSc
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10658\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">Set up ADO connection</link>"
+msgstr ""
+
+#. sUX3D
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10667\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">Set up JDBC connection</link>"
+msgstr ""
+
+#. BRUYG
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10676\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">Set up Oracle database connection</link>"
+msgstr ""
+
+#. JtGv6
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN10694\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC settings</link>"
+msgstr ""
+
+#. A69nZ
+#: dabawiz01.xhp
+msgctxt ""
+"dabawiz01.xhp\n"
+"par_idN106A3\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02spreadsheet.xhp\">Set up Spreadsheet connection</link>"
+msgstr ""
+
+#. YSNPt
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"tit\n"
+"help.text"
+msgid "Set up user authentication"
+msgstr ""
+
+#. EhtLD
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN1053A\n"
+"help.text"
+msgid "Set up user authentication"
+msgstr ""
+
+#. TGHfv
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN1053E\n"
+"help.text"
+msgid "Some databases require a user name and password."
+msgstr ""
+
+#. 6YqKR
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN10541\n"
+"help.text"
+msgid "User name"
+msgstr ""
+
+#. q5JV4
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN10545\n"
+"help.text"
+msgid "<ahelp hid=\".\">Enter the user name to access the database.</ahelp>"
+msgstr ""
+
+#. cAFEU
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN10548\n"
+"help.text"
+msgid "Password required"
+msgstr ""
+
+#. wctGK
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN1054C\n"
+"help.text"
+msgid "<ahelp hid=\".\">Select to prompt a user for a password to access the database.</ahelp>"
+msgstr ""
+
+#. xnkR8
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN10549\n"
+"help.text"
+msgid "Test Connection"
+msgstr ""
+
+#. jkqUK
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN10546\n"
+"help.text"
+msgid "<ahelp hid=\".\">Check if the configured connection can be used to access the database.</ahelp>"
+msgstr ""
+
+#. 9d4Bh
+#: dabawiz03auth.xhp
+msgctxt ""
+"dabawiz03auth.xhp\n"
+"par_idN1054F\n"
+"help.text"
+msgid "<link href=\"text/shared/explorer/database/dabawiz02.xhp\">Save and proceed</link>"
+msgstr ""
+
 #. cLmBi
 #: main.xhp
 msgctxt ""
@@ -7555,13 +8059,13 @@ msgctxt ""
 msgid "To create a new database file, choose <emph>File - New - Database</emph>."
 msgstr ""
 
-#. h4EpR
+#. QGxGW
 #: main.xhp
 msgctxt ""
 "main.xhp\n"
 "par_idN1083B\n"
 "help.text"
-msgid "The <link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link> helps you to create a database file and to register a new database within %PRODUCTNAME."
+msgid "The <link href=\"text/sdatabase/dabawiz01.xhp\">Database Wizard</link> helps you to create a database file and to register a new database within %PRODUCTNAME."
 msgstr ""
 
 #. 2jPWg
diff --git a/source/bo/helpcontent2/source/text/shared/01.po b/source/bo/helpcontent2/source/text/shared/01.po
index ddf39505218..8cf0edad438 100644
--- a/source/bo/helpcontent2/source/text/shared/01.po
+++ b/source/bo/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-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
 "PO-Revision-Date: 2018-11-14 11:52+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -223,13 +223,13 @@ msgctxt ""
 msgid "Database"
 msgstr ""
 
-#. 9cSKy
+#. H6M7M
 #: 01010000.xhp
 msgctxt ""
 "01010000.xhp\n"
 "par_idN108D0\n"
 "help.text"
-msgid "Opens the <link href=\"text/shared/explorer/database/dabawiz00.xhp\"><emph>Database Wizard</emph></link> to create a <link href=\"text/sdatabase/dabadoc.xhp\"><emph>database file</emph></link>."
+msgid "Opens the <link href=\"text/sdatabase/dabawiz01.xhp\"><emph>Database Wizard</emph></link> to create a <link href=\"text/sdatabase/dabadoc.xhp\"><emph>database file</emph></link>."
 msgstr ""
 
 #. 9nYdo
@@ -25270,76 +25270,103 @@ msgctxt ""
 msgid "Set the font size for the selected text."
 msgstr ""
 
-#. ECPzg
+#. Gmpzb
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
 "tit\n"
 "help.text"
-msgid "Merge"
+msgid "Merge Cells"
 msgstr ""
 
-#. dEoq9
+#. vrqEL
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
-"hd_id3154765\n"
+"bm_id501632012952361\n"
+"help.text"
+msgid "<bookmark_value>merge/merging cells</bookmark_value>"
+msgstr ""
+
+#. 4qzwA
+#: 05100100.xhp
+msgctxt ""
+"05100100.xhp\n"
+"hd_id451632377983974\n"
 "help.text"
-msgid "<link href=\"text/shared/01/05100100.xhp\" name=\"Merge\">Merge</link>"
+msgid "<variable id=\"mergecells\"><link href=\"text/shared/01/05100100.xhp\" name=\"Merging Cells without centering\">Merge Cells</link></variable>"
 msgstr ""
 
-#. tEsgH
+#. NCP7C
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
 "par_id3147406\n"
 "help.text"
-msgid "<variable id=\"verbindentext\"><ahelp hid=\".\">Combines the contents of the selected table cells into a single cell.</ahelp></variable>"
+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 ""
 
-#. xDN3K
+#. ip2CD
+#: 05100100.xhp
+msgctxt ""
+"05100100.xhp\n"
+"par_id461632808376973\n"
+"help.text"
+msgid "Click and drag to select the cells to be merged then do one of the following:"
+msgstr ""
+
+#. bJGUQ
+#: 05100100.xhp
+msgctxt ""
+"05100100.xhp\n"
+"par_id221632803290526\n"
+"help.text"
+msgid "In the <emph>Formatting</emph> toolbar, click:"
+msgstr ""
+
+#. R8GWz
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
 "par_id3154351\n"
 "help.text"
-msgid "Choose <emph>Table - Merge Cells</emph>"
+msgid "Or, right click the selection to open the context menu and choose <menuitem>Merge Cells</menuitem>.<br/>If <menuitem>Unmerge Cells</menuitem> is present instead then the cell selection contains merged cells and cannot be merged further."
 msgstr ""
 
-#. 2Z8Ap
+#. Fz6u9
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
-"par_id3154370\n"
+"par_id931632803442925\n"
 "help.text"
-msgid "On the <emph>Table</emph> Bar, click"
+msgid "Or, in the <emph>Properties</emph> sidebar mark the <emph>Merge Cells</emph> checkbox."
 msgstr ""
 
-#. 4xBHv
+#. fsBRE
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
-"par_id3153996\n"
+"par_id3154020\n"
 "help.text"
-msgid "<image id=\"img_id3154002\" src=\"cmd/sc_mergecells.png\" width=\"0.423cm\" height=\"0.423cm\"><alt id=\"alt_id3154002\">icon</alt></image>"
+msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Merge Cells</menuitem>."
 msgstr ""
 
-#. iBTdS
+#. tHAGa
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
-"par_id3150662\n"
+"par_id321632377889618\n"
 "help.text"
-msgid "Merge Cells"
+msgid "Choose <emph>Table - Merge Cells</emph>.<br/>"
 msgstr ""
 
-#. R7DEf
+#. B7FNs
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
-"par_id3153718\n"
+"par_id3154370\n"
 "help.text"
-msgid "Merging cells can lead to calculation errors in formulas in the table."
+msgid "Or, on the <emph>Table</emph> toolbar click:"
 msgstr ""
 
 #. pfYCj
@@ -25351,67 +25378,130 @@ msgctxt ""
 msgid "Split Cells"
 msgstr ""
 
-#. ivMXF
+#. njuVE
 #: 05100200.xhp
 msgctxt ""
 "05100200.xhp\n"
-"hd_id3154654\n"
+"bm_id501632012952361\n"
 "help.text"
-msgid "<link href=\"text/shared/01/05100200.xhp\" name=\"Split Cells\">Split Cells</link>"
+msgid "<bookmark_value>unmerge/unmerging cells</bookmark_value>      <bookmark_value>split/splitting cells</bookmark_value>"
 msgstr ""
 
-#. hByYt
+#. zDkKt
 #: 05100200.xhp
 msgctxt ""
 "05100200.xhp\n"
-"par_id3083451\n"
+"hd_id621632385142590\n"
 "help.text"
-msgid "<variable id=\"teilentext\"><ahelp hid=\".\">Splits the cell or group of cells horizontally or vertically into the number of cells that you enter.</ahelp></variable>"
+msgid "<variable id=\"unmergecells\"><link href=\"text/shared/01/05100200.xhp\" name=\"Unmerging Cells\">Unmerge Cells</link></variable>"
 msgstr ""
 
-#. Kpg6k
+#. 3oTxu
 #: 05100200.xhp
 msgctxt ""
 "05100200.xhp\n"
-"par_id3154024\n"
+"par_id871632385128307\n"
 "help.text"
-msgid "Choose <emph>Table - Split Cells</emph>"
+msgid "<ahelp hid=\".\">Divides previously merged cells back to the original cells. If the original cells had content that was kept when merged  that content is restored.</ahelp>"
 msgstr ""
 
-#. ef6va
+#. qBugU
 #: 05100200.xhp
 msgctxt ""
 "05100200.xhp\n"
-"par_id3154042\n"
+"par_id1001632807096225\n"
 "help.text"
-msgid "On the <emph>Table</emph> Bar, click"
+msgid "Select the cells to be unmerged then do one of the following:"
 msgstr ""
 
-#. xKWAC
+#. 8HDVx
 #: 05100200.xhp
 msgctxt ""
 "05100200.xhp\n"
-"par_id3147270\n"
+"par_id961632804418168\n"
 "help.text"
-msgid "<image id=\"img_id3147275\" src=\"cmd/sc_splitcell.png\" width=\"0.423cm\" height=\"0.423cm\"><alt id=\"alt_id3147275\">Icon</alt></image>"
+msgid "In the <emph>Formatting</emph> toolbar click:"
 msgstr ""
 
-#. GfBQk
+#. VvKDu
 #: 05100200.xhp
 msgctxt ""
 "05100200.xhp\n"
-"par_id3150616\n"
+"par_id161632275254217\n"
 "help.text"
-msgid "Split Cells"
+msgid "Or, right click the selection to open the context menu and choose <menuitem>Unmerge Cells</menuitem>.<br/>If <menuitem>Merge Cells</menuitem> is present instead then the cell selection does not contain any merged cells."
+msgstr ""
+
+#. WLbsk
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id901632804430738\n"
+"help.text"
+msgid "Or, in the <emph>Properties</emph> sidebar clear the <emph>Merge Cells</emph> checkbox."
+msgstr ""
+
+#. BNuGm
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id381632805680565\n"
+"help.text"
+msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Unmerge Cells</menuitem>"
+msgstr ""
+
+#. Tvbae
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"hd_id3154654\n"
+"help.text"
+msgid "<variable id=\"splitcells\"><link href=\"text/shared/01/05100200.xhp\" name=\"Splitting Cells\">Split Cells</link></variable>"
+msgstr ""
+
+#. 3sZ8J
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id3083451\n"
+"help.text"
+msgid "<variable id=\"teilentext\"><ahelp hid=\".\">Displays the Split Cells Dialog where the split can be defined as either horizontally or vertically and the number the each cell will be split into.</ahelp></variable>"
+msgstr ""
+
+#. yAYPv
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id321632807186976\n"
+"help.text"
+msgid "Do one of the following:<br/>"
+msgstr ""
+
+#. KBJNC
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id3154024\n"
+"help.text"
+msgid "Choose <emph>Table - Split Cells</emph>.<br/>"
+msgstr ""
+
+#. pNAsT
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id3154042\n"
+"help.text"
+msgid "Or, on the <emph>Table</emph> toolbar click:"
 msgstr ""
 
-#. tkVC9
+#. 4oLAA
 #: 05100200.xhp
 msgctxt ""
 "05100200.xhp\n"
 "hd_id3154558\n"
 "help.text"
-msgid "Split cell into"
+msgid "Split Cells Dialog"
 msgstr ""
 
 #. cDdv6
diff --git a/source/bo/helpcontent2/source/text/shared/explorer/database.po b/source/bo/helpcontent2/source/text/shared/explorer/database.po
index fb5667cc2f0..131a75b0cf4 100644
--- a/source/bo/helpcontent2/source/text/shared/explorer/database.po
+++ b/source/bo/helpcontent2/source/text/shared/explorer/database.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-10 23:11+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
 "PO-Revision-Date: 2018-11-12 13:20+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,393 +16,6 @@ msgstr ""
 "X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1542028837.000000\n"
 
-#. BhD6X
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"tit\n"
-"help.text"
-msgid "Database Wizard"
-msgstr "གཞི་གྲངས་མཛོད་སྣེ་སྟོན།"
-
-#. 3PAca
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"bm_id2026429\n"
-"help.text"
-msgid "<bookmark_value>wizards;databases (Base)</bookmark_value><bookmark_value>Database Wizard (Base)</bookmark_value><bookmark_value>databases; formats (Base)</bookmark_value><bookmark_value>MySQL databases (Base)</bookmark_value><bookmark_value>MariaDB databases (Base)</bookmark_value><bookmark_value>dBASE; database settings (Base)</bookmark_value><bookmark_value>spreadsheets;as databases (base)</bookmark_value>"
-msgstr ""
-
-#. 4QDPm
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN105B4\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">གཞི་གྲངས་མཛོད་སྣེ་སྟོན་</link>"
-
-#. hmups
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN105C4\n"
-"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">The Database Wizard creates a database file that contains information about a database.</ahelp>"
-msgstr ""
-
-#. 4L7fe
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_id9856563\n"
-"help.text"
-msgid "The Database Wizard creates a <link href=\"text/sdatabase/dabadoc.xhp\">database file</link> that contains information about a database."
-msgstr ""
-
-#. MP58w
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN105D5\n"
-"help.text"
-msgid "Depending on the type of operation and the type of database, the Database Wizard consists of a varying number of steps."
-msgstr "བཀོལ་སྤྱོད་རིགས་དང་གཞི་གྲངས་མཛོད་ཀྱི་རིགས་མི་འདྲ་བར་ལྟ་བ་ \"གཞི་གྲངས་མཛོད་སྣེ་སྟོན་\"ལ་ཚུད་པའི་གོ་རིམ་གྲངས་ཡང་མི་མཚུངས།"
-
-#. BvAbd
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN105DB\n"
-"help.text"
-msgid "If you create a new database file, the wizard contains two steps."
-msgstr "གལ་ཏེ་གཞི་གྲངས་མཛོད་ཡིག་ཆ་གསར་པ་གསར་འཛུགས་ན་སྣེ་སྟོན་ལ་གོ་རིམ་གཉིས་ཚུད་ཡོད།"
-
-#. 75qWp
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN105DF\n"
-"help.text"
-msgid "If you open the Database Wizard to create a database file for an existing database connection, there may be more steps to specify paths, authentication information, and more."
-msgstr "གལ་ཏེ་\"གཞི་གྲངས་མཛོད་སྣེ་སྟོན་\"ཁ་ཕྱེ་ནས་ད་ཡོད་གཞི་གྲངས་མཛོད་སྦྲེལ་བ་ལ་གཞི་གྲངས་མཛོད་ཡིག་ཆ་གསར་འཛུགས་བྱེད་ན་ཧ་ལམ་གོ་རིམ་མང་པོ་དགོས་  དཔེར་ན་ བརྒྱུད་ལམ་གཏན་འཁེལ་  ཆ་འཕྲིན་ར་སྤྲོད་སོགས་སོ།"
-
-#. wFFQE
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN105F2\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">Set up text file connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">ཡིག་དེབ་ཡིག་ཆའི་སྦྲེལ་བ་བཀོད་སྒྲིག།</link>"
-
-#. 73X5w
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN10601\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">Set up Microsoft Access connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">བཀོད་སྒྲིག་ Microsoft Access སྦྲེལ་བ་</link>"
-
-#. ckemB
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN1062E\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">Set up ADO connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">ADO སྦྲེལ་བ་བཀོད་སྒྲིག་ </link>"
-
-#. bbTEe
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN1070F\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02dbase.xhp\">Set up dBASE connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02dbase.xhp\">བཀོད་སྒྲིག་ dBase སྦྲེལ་བ་</link>"
-
-#. mM3XM
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN1063D\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">Set up JDBC connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">JDBC སྦྲེལ་བ་བཀོད་སྒྲིག་ </link>"
-
-#. EB2yp
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN1064C\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">Set up Oracle database connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">Oracle གཞི་གྲངས་མཛོད་སྦྲེལ་བ་བཀོད་སྒྲིག་ </link>"
-
-#. sSrMX
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN1066A\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC settings</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC བཀོད་སྒྲིག།</link>"
-
-#. Jht8w
-#: dabawiz00.xhp
-msgctxt ""
-"dabawiz00.xhp\n"
-"par_idN10679\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02spreadsheet.xhp\">Set up Spreadsheet connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02dbase.xhp\">བཀོད་སྒྲིག་ dBase སྦྲེལ་བ་</link>"
-
-#. menWz
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"tit\n"
-"help.text"
-msgid "Database Selection"
-msgstr "གཞི་གྲངས་མཛོད་འདེམས་པ།"
-
-#. cE94h
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"bm_id2082583\n"
-"help.text"
-msgid "<bookmark_value>databases; connecting (Base)</bookmark_value>"
-msgstr "<bookmark_value>གཞི་གྲངས་མཛོད་;འདྲུད་འཇོག།</bookmark_value>"
-
-#. ZCQvJ
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1054D\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz01.xhp\">Select Database</link>"
-msgstr ""
-
-#. MNcgG
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1055D\n"
-"help.text"
-msgid "<ahelp hid=\".\">Creates a new database, opens a database file, or connects to an existing database.</ahelp>"
-msgstr "<ahelp hid=\".\">གཞི་གྲངས་མཛོད་གསར་འཛུགས་སམ་གཞི་གྲངས་མཛོད་ལ་སྦྲེལ་བ།  </ahelp>"
-
-#. 3gKji
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10585\n"
-"help.text"
-msgid "Create a new database"
-msgstr "གཞི་གྲངས་མཛོད་གསར་པ་གསར་འཛུགས།"
-
-#. QsxqK
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10589\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select to create a new database. </ahelp>This option uses the HSQL database engine with default settings. The final page of the wizard appears next."
-msgstr "<ahelp hid=\".\">གཞི་གྲངས་མཛོད་གསར་པ་འདེམས་དགོས། </ahelp>འདེམས་གཞི་འདིས་ཁས་ལེན་བཀོད་སྒྲིག་གི་ HSQL གཞི་གྲངས་མཛོད་འདྲེན་པོ་ལྡན་པོ་སྤྱོད།  དེར་མཐུད་དེ་སྣེ་སྟོན་གྱི་མཇུག་མཐའི་ཤོག་ལྷེ་ཐོན་པར་འགྱུར།"
-
-#. FMbMQ
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_id8584246\n"
-"help.text"
-msgid "<link href=\"http://hsqldb.org/\">External web page about HSQL</link>."
-msgstr ""
-
-#. RzgCQ
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN105F9\n"
-"help.text"
-msgid "Open an existing database file"
-msgstr "ད་ཡོད་ཀྱི་གཞི་གྲངས་མཛོད་ཡིག་ཆ་ཁ་ཕྱེ་རྒྱུ།"
-
-#. SrmuV
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN105FD\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select to open a database file from a list of recently used files or from a file selection dialog.</ahelp>"
-msgstr "<ahelp hid=\".\">ཉེ་ཆར་བེད་སྤྱོད་པའི་ཡིག་ཆའི་རེའུ་འགོད་འདེམས་པའམ་ཡིག་ཆ་འདེམས་པའི་གླེང་སྒྲོམ་ནང་གཞི་གྲངས་མཛོད་ཡིག་ཆ་ཁ་འབྱེད་རྒྱུ།</ahelp>"
-
-#. HNAd8
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10614\n"
-"help.text"
-msgid "Recently used"
-msgstr "ཉེར་ཆར་བེད་སྤྱོད་པ།"
-
-#. ZGuNR
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10618\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select a database file to open from the list of recently used files. Click Finish to open the file immediately and to exit the wizard.</ahelp>"
-msgstr "<ahelp hid=\".\">ཉེ་ཆར་བེད་སྤྱོད་བྱས་པའི་ཡིག་ཆའི་རེའུ་འགོད་ནང་ཁ་ཕྱེ་རྒྱུའི་གཞི་གྲངས་མཛོད་ཡིག་ཆ་ཁ་ཕྱེ་རྒྱུ་ \"ལེགས་གྲུབ་\"ལ་རྐྱང་རྡེབ་བྱས་རྗེས་ལམ་སེང་ཡིག་ཆ་ཁ་ཕྱེ་བ་མ་ཟད་སྣེ་སྟོན་ཕྱིར་ཐོན་བྱེད། </ahelp>"
-
-#. ACzer
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1062F\n"
-"help.text"
-msgid "Open"
-msgstr "ཁ་ཕྱེ།"
-
-#. 9WBfN
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10633\n"
-"help.text"
-msgid "<ahelp hid=\".\">Opens a file selection dialog where you can select a database file. Click Open or OK in the file selection dialog to open the file immediately and to exit the wizard.</ahelp>"
-msgstr "<ahelp hid=\".\">ཡིག་ཆ་ཁ་ཕྱེ་སྟེ་གླེང་སྒྲོམ་ཁ་ཕྱེ་དགོས་  འདིར་གཞི་གྲངས་མཛོད་ཡིག་ཆ་འདེམས་དགོས།  ཡིག་ཆ་འདེམས་པའི་གླེང་སྒྲོམ་ནང་\"ཁ་ཕྱེ་\"ཡང་ན་\"གཏན་འཁེལ་\" ལ་རྐྱང་རྡེབ་བྱ་ལམ་སེང་ཡིག་ཆ་ཁ་ཕྱེ་བ་མ་ཟད་སྣེ་སྟོན་ཕྱིར་ཐོན་བྱེད། </ahelp>"
-
-#. rLwWT
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1058C\n"
-"help.text"
-msgid "Connect to an existing database"
-msgstr "ད་ཡོད་ཀྱི་གཞི་གྲངས་མཛོད་ལ་སྦྲེལ་བ།"
-
-#. tF4HK
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10590\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select to create a database document for an existing database connection.</ahelp>"
-msgstr "<ahelp hid=\".\">ད་ཡོས་གཞི་གྲངས་མཛོད་སྦྲེལ་བའི་གཞི་གྲངས་མཛོད་ཡིག་ཆ་གསར་འཛུགས་འདེམས་དགོས། </ahelp>"
-
-#. M4MGu
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10593\n"
-"help.text"
-msgid "Database type"
-msgstr "གཞི་གྲངས་མཛོད་ཀྱི་རིགས།"
-
-#. jypBq
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10597\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select the database type for the existing database connection.</ahelp>"
-msgstr "<ahelp hid=\".\">ད་ཡོས་གཞི་གྲངས་མཛོད་སྦྲེལ་བའི་གཞི་གྲངས་མཛོད་ཡིག་ཆ་གསར་འཛུགས་འདེམས་དགོས། </ahelp>"
-
-#. xNvnU
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1059A\n"
-"help.text"
-msgid "The Outlook, Evolution, KDE Address Book, and Seamonkey database types do not need additional information. For other database types, the wizard contains additional pages to specify the required information."
-msgstr "Outlook、Evolution དང་ Mozilla གཞི་གྲངས་མཛོད་ཀྱི་རིགས་གཞན་པའི་ཆ་འཕྲིན་མི་དགོས། གཞན་པའི་གཞི་གྲངས་མཛོད་ཀྱི་རིགས་ལ་མཚོན་ན་ སྣེ་སྟོན་ལ་མཁོ་བའི་ཆ་འཕྲིན་གྱི་ཟུར་སྣོན་ཤོག་ངོས་གཏན་འཁེལ་བྱེད།"
-
-#. 4RN7W
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10611\n"
-"help.text"
-msgid "The next wizard page is one of the following pages:"
-msgstr "གཤམ་གྱི་སྣེ་སྟོན་ཤོག་ལྷེ་ནི་གཤམ་གྱི་ཤོག་ངོས་ཤིག་ཡིན།"
-
-#. vaBGS
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1061C\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">Set up text file connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02text.xhp\">ཡིག་དེབ་ཡིག་ཆའི་སྦྲེལ་བ་བཀོད་སྒྲིག།</link>"
-
-#. NEWQn
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1062B\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">Set up Microsoft Access or Microsoft Access 2007 connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02access.xhp\">བཀོད་སྒྲིག་ Microsoft Access སྦྲེལ་བ་</link>"
-
-#. NCWx8
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN1063A\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02ldap.xhp\">Set up LDAP connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02ldap.xhp\">LDAP སྦྲེལ་བ་བཀོད་སྒྲིག་ </link>"
-
-#. 29mSc
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10658\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">Set up ADO connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02ado.xhp\">ADO སྦྲེལ་བ་བཀོད་སྒྲིག་ </link>"
-
-#. sUX3D
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10667\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">Set up JDBC connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">JDBC སྦྲེལ་བ་བཀོད་སྒྲིག་ </link>"
-
-#. BRUYG
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10676\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">Set up Oracle database connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02oracle.xhp\">Oracle གཞི་གྲངས་མཛོད་སྦྲེལ་བ་བཀོད་སྒྲིག་ </link>"
-
-#. JtGv6
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN10694\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC settings</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02odbc.xhp\">ODBC བཀོད་སྒྲིག།</link>"
-
-#. A69nZ
-#: dabawiz01.xhp
-msgctxt ""
-"dabawiz01.xhp\n"
-"par_idN106A3\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02spreadsheet.xhp\">Set up Spreadsheet connection</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02dbase.xhp\">བཀོད་སྒྲིག་ dBase སྦྲེལ་བ་</link>"
-
 #. SJaiE
 #: dabawiz02.xhp
 msgctxt ""
@@ -502,15 +115,6 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Select to call the <link href=\"text/shared/explorer/database/tablewizard00.xhp\">Table Wizard</link> after the Database Wizard is finished.</ahelp>"
 msgstr "<ahelp hid=\".\">\"གཞི་གྲངས་མཛོད་སྣེ་སྟོན་\"མཇུག་བསྡུས་རྗེས་ཁོལ་སྤྱོད་འདེམས་དགོས་<link href=\"text/shared/explorer/database/tablewizard00.xhp\">རེའུ་མིག་སྣེ་སྟོན།</link></ahelp>"
 
-#. 3xrCA
-#: dabawiz02.xhp
-msgctxt ""
-"dabawiz02.xhp\n"
-"par_idN1061A\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">གཞི་གྲངས་མཛོད་སྣེ་སྟོན་</link>"
-
 #. YnZ24
 #: dabawiz02access.xhp
 msgctxt ""
@@ -592,15 +196,6 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Click to open a file selection dialog.</ahelp>"
 msgstr "<ahelp hid=\".\">རྐྱང་རྡེབ་ཀྱིས་ཡིག་ཆ་ཁ་ཕྱེ་དང་གླེང་སྒྲོམ་ཁ་ཕྱེ། </ahelp>"
 
-#. bjaYj
-#: dabawiz02access.xhp
-msgctxt ""
-"dabawiz02access.xhp\n"
-"par_idN10552\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">གཞི་གྲངས་མཛོད་སྣེ་སྟོན་</link>"
-
 #. gjtnv
 #: dabawiz02ado.xhp
 msgctxt ""
@@ -772,15 +367,6 @@ msgctxt ""
 msgid "A password must contain 3 to 18 characters."
 msgstr ""
 
-#. WBFBr
-#: dabawiz02ado.xhp
-msgctxt ""
-"dabawiz02ado.xhp\n"
-"par_idN1059C\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">གཞི་གྲངས་མཛོད་སྣེ་སྟོན་</link>"
-
 #. mxSCU
 #: dabawiz02dbase.xhp
 msgctxt ""
@@ -835,15 +421,6 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Open a path selection dialog.</ahelp>"
 msgstr "<ahelp hid=\".\">བརྒྱུད་ལམ་ཁ་ཕྱེ་ནས་གླེང་སྒྲོམ་ཁ་ཕྱེ་བ། </ahelp>"
 
-#. Hj37d
-#: dabawiz02dbase.xhp
-msgctxt ""
-"dabawiz02dbase.xhp\n"
-"par_idN10584\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">གཞི་གྲངས་མཛོད་སྣེ་སྟོན་</link>"
-
 #. n9AxK
 #: dabawiz02jdbc.xhp
 msgctxt ""
@@ -1114,23 +691,14 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Tests the connection with the current settings.</ahelp>"
 msgstr "<ahelp hid=\".\">མིག་སྔའི་ལྟ་ཚོད་སྦྲེལ་བའི་བཀོད་སྒྲིག་སྤྱོད་པ།  </ahelp>"
 
-#. 6Gw68
+#. FGezr
 #: dabawiz02jdbc.xhp
 msgctxt ""
 "dabawiz02jdbc.xhp\n"
 "par_idN106E7\n"
 "help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">Authentication</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">ར་སྤྲོད།</link>"
-
-#. cmVsm
-#: dabawiz02jdbc.xhp
-msgctxt ""
-"dabawiz02jdbc.xhp\n"
-"par_idN106F6\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">གཞི་གྲངས་མཛོད་སྣེ་སྟོན་</link>"
+msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
+msgstr ""
 
 #. Y4EFA
 #: dabawiz02mysql.xhp
@@ -1330,23 +898,14 @@ msgctxt ""
 msgid "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">JDBC Connection</link>"
 msgstr "<link href=\"text/shared/explorer/database/dabawiz02jdbc.xhp\">JDBC སྦྲེལ་བ་</link>"
 
-#. uuyuk
+#. ujaGF
 #: dabawiz02mysql.xhp
 msgctxt ""
 "dabawiz02mysql.xhp\n"
 "par_idN10591\n"
 "help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">Authentication</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">ར་སྤྲོད།</link>"
-
-#. E6mUz
-#: dabawiz02mysql.xhp
-msgctxt ""
-"dabawiz02mysql.xhp\n"
-"par_idN105A0\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">གཞི་གྲངས་མཛོད་སྣེ་སྟོན་</link>"
+msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
+msgstr ""
 
 #. HF588
 #: dabawiz02odbc.xhp
@@ -1474,23 +1033,14 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Select a data source to which you want to connect using ODBC. Then click <emph>OK</emph>.</ahelp>"
 msgstr "<ahelp hid=\".\"> ODBC སྦྲེལ་བའི་གཞི་གྲངས་ཁུངས་སྤྱོད་རྒྱུ་བདམས་རྗེས་<emph>\"གཏན་འཁེལ་\"</emph>ལ་རྐྱང་རྡེབ་བྱ།</ahelp>"
 
-#. z7ivo
+#. WaAZB
 #: dabawiz02odbc.xhp
 msgctxt ""
 "dabawiz02odbc.xhp\n"
 "par_idN10567\n"
 "help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">Authentication</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">ར་སྤྲོད།</link>"
-
-#. 2Lnms
-#: dabawiz02odbc.xhp
-msgctxt ""
-"dabawiz02odbc.xhp\n"
-"par_idN10576\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">གཞི་གྲངས་མཛོད་སྣེ་སྟོན་</link>"
+msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
+msgstr ""
 
 #. RL7sk
 #: dabawiz02oracle.xhp
@@ -1645,23 +1195,14 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Tests the connection with the current settings.</ahelp>"
 msgstr "<ahelp hid=\".\">མིག་སྔའི་ལྟ་ཚོད་སྦྲེལ་བའི་བཀོད་སྒྲིག་སྤྱོད་པ།  </ahelp>"
 
-#. xAvje
+#. UwteE
 #: dabawiz02oracle.xhp
 msgctxt ""
 "dabawiz02oracle.xhp\n"
 "par_idN10637\n"
 "help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">Authentication</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz03auth.xhp\">ར་སྤྲོད།</link>"
-
-#. LEpR3
-#: dabawiz02oracle.xhp
-msgctxt ""
-"dabawiz02oracle.xhp\n"
-"par_idN10646\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">གཞི་གྲངས་མཛོད་སྣེ་སྟོན་</link>"
+msgid "<link href=\"text/sdatabase/dabawiz03auth.xhp\">Authentication</link>"
+msgstr ""
 
 #. XoiBM
 #: dabawiz02spreadsheet.xhp
@@ -1735,15 +1276,6 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Select to request a password from the user of the database document.</ahelp>"
 msgstr "<ahelp hid=\".\">གཞི་གྲངས་མཛོད་ཡིག་ཚགས་ནས་སྤྱོད་པོར་གསང་ཨང་རེ་བ་བྱེད་པ་ནང་འཇུག་བྱ། </ahelp>"
 
-#. BcRAT
-#: dabawiz02spreadsheet.xhp
-msgctxt ""
-"dabawiz02spreadsheet.xhp\n"
-"par_idN10553\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">གཞི་གྲངས་མཛོད་སྣེ་སྟོན་</link>"
-
 #. xngE4
 #: dabawiz02text.xhp
 msgctxt ""
@@ -1951,114 +1483,6 @@ msgctxt ""
 msgid "<ahelp hid=\".\">Enter or select the character that is used as a thousands separator in the text file, for example a comma (1,000), or a period (1.000).</ahelp>"
 msgstr ""
 
-#. D9AZK
-#: dabawiz02text.xhp
-msgctxt ""
-"dabawiz02text.xhp\n"
-"par_idN105E6\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">གཞི་གྲངས་མཛོད་སྣེ་སྟོན་</link>"
-
-#. YSNPt
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"tit\n"
-"help.text"
-msgid "Set up user authentication"
-msgstr ""
-
-#. EhtLD
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN1053A\n"
-"help.text"
-msgid "Set up user authentication"
-msgstr ""
-
-#. TGHfv
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN1053E\n"
-"help.text"
-msgid "Some databases require a user name and password."
-msgstr ""
-
-#. 6YqKR
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN10541\n"
-"help.text"
-msgid "User name"
-msgstr "སྤྱོད་པོའི་མིང་།"
-
-#. q5JV4
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN10545\n"
-"help.text"
-msgid "<ahelp hid=\".\">Enter the user name to access the database.</ahelp>"
-msgstr "<ahelp hid=\".\">གཞི་གྲངས་མཛོད་ལ་འཚམས་འདྲི་བྱེད་པའི་མིང་ནང་འཇུག་བྱ། </ahelp>"
-
-#. cAFEU
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN10548\n"
-"help.text"
-msgid "Password required"
-msgstr "གསང་ཨང་ནང་འཇུག་བྱེད་དགོས་པ།"
-
-#. wctGK
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN1054C\n"
-"help.text"
-msgid "<ahelp hid=\".\">Select to prompt a user for a password to access the database.</ahelp>"
-msgstr "<ahelp hid=\".\">སྤྱོད་པོས་གཞི་གྲངས་མཛོད་ལ་འཚམས་འདི་བྱེད་དུས་གསང་ཨང་ནང་འཇུག་གི་དྲན་བརྡ་འདེམས་པ་</ahelp>"
-
-#. xnkR8
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN10549\n"
-"help.text"
-msgid "Test Connection"
-msgstr ""
-
-#. jkqUK
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN10546\n"
-"help.text"
-msgid "<ahelp hid=\".\">Check if the configured connection can be used to access the database.</ahelp>"
-msgstr ""
-
-#. 9d4Bh
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN1054F\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz02.xhp\">Save and proceed</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz02.xhp\">གཤམ་གྱི་གོ་རིམ།</link>"
-
-#. f9faN
-#: dabawiz03auth.xhp
-msgctxt ""
-"dabawiz03auth.xhp\n"
-"par_idN10566\n"
-"help.text"
-msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
-msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">གཞི་གྲངས་མཛོད་སྣེ་སྟོན་</link>"
-
 #. rw2xT
 #: menubar.xhp
 msgctxt ""
diff --git a/source/bo/helpcontent2/source/text/shared/guide.po b/source/bo/helpcontent2/source/text/shared/guide.po
index b2bcac44a71..b95e79d5799 100644
--- a/source/bo/helpcontent2/source/text/shared/guide.po
+++ b/source/bo/helpcontent2/source/text/shared/guide.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
 "PO-Revision-Date: 2018-11-14 11:52+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -790,13 +790,13 @@ msgctxt ""
 msgid "Continue redacting other portions of the generated document and then print or export it to PDF."
 msgstr ""
 
-#. gnseq
+#. AGQiE
 #: auto_redact.xhp
 msgctxt ""
 "auto_redact.xhp\n"
 "par_id581626101004089\n"
 "help.text"
-msgid "Refer to the help page <embedvar href=\"text/shared/01/02100001.xhp#02100001\"/> to learn more about regular expressions."
+msgid "Refer to the help page <link href=\"text/shared/01/02100001.xhp\" name=\"regex_link\">List of Regular Expressions</link> to learn more about how to use regular expressions in %PRODUCTNAME."
 msgstr ""
 
 #. AE55E
@@ -6586,13 +6586,13 @@ msgctxt ""
 msgid "Open a Base file of the database type that you want."
 msgstr ""
 
-#. bVf6R
+#. fGBzV
 #: data_im_export.xhp
 msgctxt ""
 "data_im_export.xhp\n"
 "par_id7869502\n"
 "help.text"
-msgid "Either create a new Base file using the <link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>, or open any existing Base file that is not read-only."
+msgid "Either create a new Base file using the <link href=\"text/sdatabase/dabawiz01.xhp\">Database Wizard</link>, or open any existing Base file that is not read-only."
 msgstr ""
 
 #. JHYC6
@@ -6712,14 +6712,14 @@ msgctxt ""
 msgid "Choose <emph>File - New - Database</emph>."
 msgstr "<emph>ཡིག་ཆ་ - གསར་འཛུགས་ - གཞི་གྲངས་མཛོད་</emph>འདེམས་པ།"
 
-#. FMZud
+#. BsTGf
 #: data_new.xhp
 msgctxt ""
 "data_new.xhp\n"
 "par_idN105CB\n"
 "help.text"
-msgid "This opens the <link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>, where you create a new database file."
-msgstr "དེ་ལྟར་<link href=\"text/shared/explorer/database/dabawiz00.xhp\">གཞི་གྲངས་མཛོད་སྣ་སྟོན་</link>ཁ་ཕྱེ་ཐུབ་ སྣེ་སྟོན་དེ་སྤྱད་ནས་གཞི་གྲངས་མཛོད་ཀྱི་ཡིག་ཆ་གསར་པ་གསར་འཛུགས་བྱེད།"
+msgid "This opens the <link href=\"text/sdatabase/dabawiz01.xhp\">Database Wizard</link>, where you create a new database file."
+msgstr ""
 
 #. zTCBz
 #: data_new.xhp
@@ -8215,22 +8215,22 @@ msgctxt ""
 msgid "Choose <menuitem>Tools - Development Tools</menuitem>"
 msgstr ""
 
-#. XaydF
+#. EcEEb
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id271627931218557\n"
 "help.text"
-msgid "After <emph>Development Tools</emph> is enabled it will become visible in all documents and %PRODUCTNAME applications. This setting is persistent and the <emph>Development Tools</emph> will remain visible until it is explicitly disabled by choosing <menuitem>Tools - Development Tools</menuitem>."
+msgid "The <emph>Development Tools</emph> are visible in all documents of %PRODUCTNAME Writer, Calc, Impress and Draw. The display is persistent and remain visible until deselected."
 msgstr ""
 
-#. D74vk
+#. YrKDj
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id3152821\n"
 "help.text"
-msgid "When <emph>Development Tools</emph> is enabled, a dockable window will be shown at the bottom of the screen. This window has two main sections:"
+msgid "When <emph>Development Tools</emph> is enabled, a dockable window is shown at the bottom of the screen. This window has two sections:"
 msgstr ""
 
 #. BbGGE
@@ -8251,13 +8251,13 @@ msgctxt ""
 msgid "<emph>Object inspection panel:</emph> Displays the available services, methods, properties and interfaces of the selected object."
 msgstr ""
 
-#. SfCJQ
+#. fiPDo
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id91627862617231\n"
 "help.text"
-msgid "This feature is available since %PRODUCTNAME 7.2 and can be used in Writer, Calc, Impress and Draw."
+msgid "This feature is available since %PRODUCTNAME 7.2 for Writer, Calc, Impress and Draw."
 msgstr ""
 
 #. 5J2jc
@@ -8287,22 +8287,22 @@ msgctxt ""
 msgid "The behavior of the tree view depends on the status of the <emph>Current Selection</emph> toggle button:"
 msgstr ""
 
-#. CjDg6
+#. CJUxG
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id811627912238786\n"
 "help.text"
-msgid "If <emph>Current Selection</emph> is <emph>enabled</emph>, then the <emph>Object Inspection Panel</emph> will display the properties of the object that is currently selected in the document. Hence, clicking any item in the tree view will have no effect."
+msgid "Click on <emph>Current Selection</emph> to display the properties of the object currently selected in the document. Hence, clicking any item in the tree view have no effect."
 msgstr ""
 
-#. 8sDyd
+#. C3mpn
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id721627912239053\n"
 "help.text"
-msgid "If <emph>Current Selection</emph> is <emph>disabled</emph>, then clicking any item in the tree view will update the contents of the <emph>Object Inspection Panel</emph>."
+msgid "Click on <emph>Current Selection</emph> again to display any item in the tree view and update the contents of the <emph>Object Inspection Panel</emph>."
 msgstr ""
 
 #. PmkTZ
@@ -8332,15 +8332,6 @@ msgctxt ""
 msgid "Supported objects"
 msgstr ""
 
-#. c5tx6
-#: dev_tools.xhp
-msgctxt ""
-"dev_tools.xhp\n"
-"par_id551627912559559\n"
-"help.text"
-msgid "Writer"
-msgstr ""
-
 #. meXjs
 #: dev_tools.xhp
 msgctxt ""
@@ -8350,15 +8341,6 @@ msgctxt ""
 msgid "Paragraphs<br/>Text Portions in a Paragraph<br/>Shapes<br/>Tables<br/>Frames<br/>Graphic Objects<br/>Embedded Objects (OLE)<br/>Style Families and Styles"
 msgstr ""
 
-#. KrHuw
-#: dev_tools.xhp
-msgctxt ""
-"dev_tools.xhp\n"
-"par_id171627912693619\n"
-"help.text"
-msgid "Calc"
-msgstr ""
-
 #. SHryG
 #: dev_tools.xhp
 msgctxt ""
@@ -8368,15 +8350,6 @@ msgctxt ""
 msgid "Sheets<br/>Shapes per sheet<br/>Charts per sheet<br/>Pivot tables per sheet<br/>Style Families and Styles"
 msgstr ""
 
-#. c5S5D
-#: dev_tools.xhp
-msgctxt ""
-"dev_tools.xhp\n"
-"par_id711627912898951\n"
-"help.text"
-msgid "Impress"
-msgstr ""
-
 #. G7tq6
 #: dev_tools.xhp
 msgctxt ""
@@ -8386,15 +8359,6 @@ msgctxt ""
 msgid "Slides<br/>Shapes per slide<br/>Master slides<br/>Style Families and Styles"
 msgstr ""
 
-#. APvko
-#: dev_tools.xhp
-msgctxt ""
-"dev_tools.xhp\n"
-"par_id711627912898022\n"
-"help.text"
-msgid "Draw"
-msgstr ""
-
 #. QBNop
 #: dev_tools.xhp
 msgctxt ""
@@ -8413,49 +8377,49 @@ msgctxt ""
 msgid "Object Inspection Panel"
 msgstr ""
 
-#. cP4WT
+#. ULvie
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id571627913372273\n"
 "help.text"
-msgid "The right side of the window consists of the <emph>Object Inspection Panel</emph> that displays information about the object being inspected."
+msgid "The right side of the window is the <emph>Object Inspection Panel</emph> that displays information about the object being inspected."
 msgstr ""
 
-#. CGBzb
+#. KJDUA
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id361627930602108\n"
 "help.text"
-msgid "The first piece of information available is the <emph>Class Name</emph>, which is the name of the implementation class of the object."
+msgid "<emph>Class Name</emph>: is the name of the object class."
 msgstr ""
 
-#. aF94B
+#. TbDBD
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id111627931046662\n"
 "help.text"
-msgid "Use the <emph>class name</emph> to search more information in the API documentation. For example, the top-level object in a Writer document is an instance of the class <emph>SwXTextDocument</emph>, which is documented at <link href=\"https://docs.libreoffice.org/sw/html/classSwXTextDocument.html\" name=\"SwXTextDocument_API\">SwXTextDocument Class Reference</link>."
+msgid "Use the class name to search more information in the API documentation. For example, the top-level object in a Writer document is an instance of the class <emph>SwXTextDocument</emph>, which is documented at <link href=\"https://docs.libreoffice.org/sw/html/classSwXTextDocument.html\" name=\"SwXTextDocument_API\">SwXTextDocument Class Reference</link>."
 msgstr ""
 
-#. X9o8G
+#. 7g3wB
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id371627930700568\n"
 "help.text"
-msgid "It is possible to inspect the object further by using the four tabs available that display its <emph>Interfaces</emph>, <emph>Services</emph>, <emph>Properties</emph> and <emph>Methods</emph>."
+msgid "You can inspect the object further by using the four tabs available that display its <emph>Interfaces</emph>, <emph>Services</emph>, <emph>Properties</emph> and <emph>Methods</emph>."
 msgstr ""
 
-#. AwMan
+#. hd4cE
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id71627913884995\n"
 "help.text"
-msgid "Each of the tabs organize the information about the object in columns. The set of columns presented depend on which tab is selected."
+msgid "The information about the object is organized in columns in each tab. The set of columns displayed depend on the selected tab."
 msgstr ""
 
 #. RECVL
@@ -8512,22 +8476,22 @@ msgctxt ""
 msgid "Contains four columns that describe the properties of the object:"
 msgstr ""
 
-#. VyG2A
+#. eNhy9
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id461627914264898\n"
 "help.text"
-msgid "<emph>Property</emph>: Shows the names of all properties that can be inspected."
+msgid "<emph>Property</emph>: Shows the names of the object properties."
 msgstr ""
 
-#. YBmE7
+#. hDfcB
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id491627914265327\n"
 "help.text"
-msgid "<emph>Value</emph>: Displays a textual representation of the values of all properties."
+msgid "<emph>Value</emph>: Displays a textual representation of the current property value."
 msgstr ""
 
 #. 7P4rv
@@ -8539,22 +8503,22 @@ msgctxt ""
 msgid "<emph>Type</emph>: Shows the property type."
 msgstr ""
 
-#. FYv4W
+#. VxeGP
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id391627914265992\n"
 "help.text"
-msgid "<emph>Info</emph>: Presents relevant information about the property. For instance, a property that is read-only will have a \"read-only\" value in this column."
+msgid "<emph>Info</emph>: display relevant information about the property. For example, a read-only property displays \"read-only\" in this column."
 msgstr ""
 
-#. G2CGc
+#. L6iHf
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id161627914138859\n"
 "help.text"
-msgid "The <emph>Properties</emph> tab contains an additional section that shows a textual representation of the value of the selected property. When a property is selected the value is updated in the text box available at the bottom of the <emph>Object Inspection Panel</emph>. This is useful when the value is too long to be shown in the <emph>Value</emph> column."
+msgid "The <emph>Properties</emph> tab also includes a text box on the bottom to display the full textual representation of the property value."
 msgstr ""
 
 #. ptFVa
@@ -8575,22 +8539,22 @@ msgctxt ""
 msgid "Contains four columns that describe the combined list of methods that can be called by the current object:"
 msgstr ""
 
-#. Bq4dK
+#. iFvEX
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id281627914839271\n"
 "help.text"
-msgid "<emph>Method</emph>: Shows the names of all properties that can be inspected."
+msgid "<emph>Method</emph>: Shows the names of all methods of the object."
 msgstr ""
 
-#. kxBZz
+#. hFE8H
 #: dev_tools.xhp
 msgctxt ""
 "dev_tools.xhp\n"
 "par_id421627914839748\n"
 "help.text"
-msgid "<emph>Return type</emph>: Displays the return type of the methods that can be called by the object. Methods that do not return any value are marked as \"void\" in this column."
+msgid "<emph>Return type</emph>: Displays the return type of the object methods. Methods that do not return any value are marked as \"void\" in this column."
 msgstr ""
 
 #. NwGtg
diff --git a/source/bo/helpcontent2/source/text/simpress/guide.po b/source/bo/helpcontent2/source/text/simpress/guide.po
index d304b069605..2122a6a6bcf 100644
--- a/source/bo/helpcontent2/source/text/simpress/guide.po
+++ b/source/bo/helpcontent2/source/text/simpress/guide.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-27 19:09+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
 "PO-Revision-Date: 2018-09-03 12:41+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5866,24 +5866,6 @@ msgctxt ""
 msgid "<ahelp hid=\".\" visibility=\"hidden\">Define the vertical alignment of selected or all cell contents. Split or merge cells.</ahelp>"
 msgstr ""
 
-#. HAWie
-#: table_insert.xhp
-msgctxt ""
-"table_insert.xhp\n"
-"par_id0916200803551553\n"
-"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">All selected cells are merged into one cell.</ahelp>"
-msgstr ""
-
-#. dP7mX
-#: table_insert.xhp
-msgctxt ""
-"table_insert.xhp\n"
-"par_id0916200803551535\n"
-"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">The selected cell is split into several cells. You see the Split Cells dialog box.</ahelp>"
-msgstr ""
-
 #. 5hutM
 #: table_insert.xhp
 msgctxt ""
diff --git a/source/bo/helpcontent2/source/text/swriter/00.po b/source/bo/helpcontent2/source/text/swriter/00.po
index 866bf420876..28d661c45bc 100644
--- a/source/bo/helpcontent2/source/text/swriter/00.po
+++ b/source/bo/helpcontent2/source/text/swriter/00.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-10 23:11+0200\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
 "PO-Revision-Date: 2018-11-14 11:52+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2212,14 +2212,14 @@ msgctxt ""
 msgid "<image id=\"img_id3147275\" src=\"cmd/sc_splitcell.png\" width=\"0.2228in\" height=\"0.2228in\"><alt id=\"alt_id3147275\">Icon</alt></image>"
 msgstr "<image id=\"img_id3145186\" src=\"cmd/sc_distributecolumns.png\" width=\"0.222inch\" height=\"0.222inch\"><alt id=\"alt_id3145186\" xml-lang=\"bo\">རིས་འགོད་</alt></image>"
 
-#. fCPij
+#. 7XaPo
 #: 00000405.xhp
 msgctxt ""
 "00000405.xhp\n"
 "par_id3150616\n"
 "help.text"
-msgid "Split Cells"
-msgstr "དྲ་མིག་དབྱེ་འཕྲལ།"
+msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Unmerge Cells</caseinline><defaultinline>Split Cells</defaultinline></switchinline>"
+msgstr ""
 
 #. BGm4B
 #: 00000405.xhp
author	Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>	2021-10-04 21:18:14 +0200
committer	Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>	2021-10-04 21:20:50 +0200
commit	e8881fe8aa87f07547d433e9fbb82e0e768eb719 (patch)
tree	cd8841438ea6cd00c4047f486da01ebc6aaa781d /source/bo/helpcontent2
parent	0cb98568b1070b0178a398e2befd36808364e37e (diff)