update translations for master

and force-fix errors using pocheck

Change-Id: I1658b92ce4e7a15ad5539e5dcba48bfd1951744f

1 files changed, 151 insertions, 61 deletions

diff --git a/source/gl/helpcontent2/source/text/shared/01.po b/source/gl/helpcontent2/source/text/shared/01.po
index 4090d5339ca..e4bda7e1c62 100644
--- a/source/gl/helpcontent2/source/text/shared/01.po
+++ b/source/gl/helpcontent2/source/text/shared/01.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2021-09-27 19:09+0200\n"
-"PO-Revision-Date: 2021-05-03 02:37+0000\n"
+"POT-Creation-Date: 2021-10-04 19:51+0200\n"
+"PO-Revision-Date: 2021-09-28 20:36+0000\n"
 "Last-Translator: Xosé <xosecalvo@gmail.com>\n"
 "Language-Team: Galician <https://translations.documentfoundation.org/projects/libo_help-master/textshared01/gl/>\n"
 "Language: gl\n"
@@ -122,7 +122,7 @@ msgctxt ""
 "par_id3156153\n"
 "help.text"
 msgid "Creates a new text document in $[officename] Writer."
-msgstr "Crea un documento de texto novo no Writer do ·$[officename]."
+msgstr "Crea un documento de texto novo no Writer do $[officename]."
 
 #. bPyBi
 #: 01010000.xhp
@@ -176,7 +176,7 @@ msgctxt ""
 "par_id3154946\n"
 "help.text"
 msgid "Creates a new presentation document in $[officename] Impress."
-msgstr "Crea un documento de presentación novo no Impress do ·$[officename]."
+msgstr "Crea un documento de presentación novo no Impress do $[officename]."
 
 #. ZFD3B
 #: 01010000.xhp
@@ -223,13 +223,13 @@ msgctxt ""
 msgid "Database"
 msgstr "Base de datos"
 
-#. 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,77 +25270,104 @@ msgctxt ""
 msgid "Set the font size for the selected text."
 msgstr "Configure o tamaño do tipo de letra do texto seleccionado."
 
-#. ECPzg
+#. Gmpzb
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
 "tit\n"
 "help.text"
-msgid "Merge"
-msgstr "Combinar"
+msgid "Merge Cells"
+msgstr ""
 
-#. dEoq9
+#. vrqEL
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
-"hd_id3154765\n"
+"bm_id501632012952361\n"
 "help.text"
-msgid "<link href=\"text/shared/01/05100100.xhp\" name=\"Merge\">Merge</link>"
-msgstr "<link href=\"text/shared/01/05200000.xhp\" name=\"Liña\">Liña</link>"
+msgid "<bookmark_value>merge/merging cells</bookmark_value>"
+msgstr ""
+
+#. 4qzwA
+#: 05100100.xhp
+msgctxt ""
+"05100100.xhp\n"
+"hd_id451632377983974\n"
+"help.text"
+msgid "<variable id=\"mergecells\"><link href=\"text/shared/01/05100100.xhp\" name=\"Merging Cells without centering\">Merge Cells</link></variable>"
+msgstr ""
 
-#. tEsgH
+#. NCP7C
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
 "par_id3147406\n"
 "help.text"
-msgid "<variable id=\"verbindentext\"><ahelp hid=\".\">Combines the contents of the selected table cells into a single cell.</ahelp></variable>"
-msgstr "<variable id=\"verbindentext\"> <ahelp hid=\".\"> Combina o contido das celas seleccionadas da táboa nunha única célula.</ahelp> </variable>"
+msgid "<variable id=\"verbindentext\"><ahelp hid=\".\">Combines the contents of the selected cells into a single cell, retaining the formatting of the first cell in the selection.</ahelp></variable>"
+msgstr ""
+
+#. ip2CD
+#: 05100100.xhp
+msgctxt ""
+"05100100.xhp\n"
+"par_id461632808376973\n"
+"help.text"
+msgid "Click and drag to select the cells to be merged then do one of the following:"
+msgstr ""
+
+#. bJGUQ
+#: 05100100.xhp
+msgctxt ""
+"05100100.xhp\n"
+"par_id221632803290526\n"
+"help.text"
+msgid "In the <emph>Formatting</emph> toolbar, click:"
+msgstr ""
 
-#. xDN3K
+#. R8GWz
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
 "par_id3154351\n"
 "help.text"
-msgid "Choose <emph>Table - Merge Cells</emph>"
-msgstr "Escolla <emph>Táboa - Combinar celas</emph>."
+msgid "Or, right click the selection to open the context menu and choose <menuitem>Merge Cells</menuitem>.<br/>If <menuitem>Unmerge Cells</menuitem> is present instead then the cell selection contains merged cells and cannot be merged further."
+msgstr ""
 
-#. 2Z8Ap
+#. Fz6u9
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
-"par_id3154370\n"
+"par_id931632803442925\n"
 "help.text"
-msgid "On the <emph>Table</emph> Bar, click"
-msgstr "Na barra <emph>Táboa</emph>, prema en"
+msgid "Or, in the <emph>Properties</emph> sidebar mark the <emph>Merge Cells</emph> checkbox."
+msgstr ""
 
-#. 4xBHv
+#. fsBRE
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
-"par_id3153996\n"
+"par_id3154020\n"
 "help.text"
-msgid "<image id=\"img_id3154002\" src=\"cmd/sc_mergecells.png\" width=\"0.423cm\" height=\"0.423cm\"><alt id=\"alt_id3154002\">icon</alt></image>"
-msgstr "<image id=\"img_id3154002\" src=\"cmd/sc_mergecells.png\" width=\"0.423cm\" height=\"0.423cm\"><alt id=\"alt_id3154002\">Icona</alt></image>"
+msgid "Or, choose <embedvar href=\"text/scalc/01/05060000.xhp#format_mergecells_menu\"/><menuitem>Merge Cells</menuitem>."
+msgstr ""
 
-#. iBTdS
+#. tHAGa
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
-"par_id3150662\n"
+"par_id321632377889618\n"
 "help.text"
-msgid "Merge Cells"
-msgstr "Combinar celas"
+msgid "Choose <emph>Table - Merge Cells</emph>.<br/>"
+msgstr ""
 
-#. R7DEf
+#. B7FNs
 #: 05100100.xhp
 msgctxt ""
 "05100100.xhp\n"
-"par_id3153718\n"
+"par_id3154370\n"
 "help.text"
-msgid "Merging cells can lead to calculation errors in formulas in the table."
-msgstr "Combinar celas pode provocar erros de cálculo en fórmulas."
+msgid "Or, on the <emph>Table</emph> toolbar click:"
+msgstr ""
 
 #. pfYCj
 #: 05100200.xhp
@@ -25351,68 +25378,131 @@ msgctxt ""
 msgid "Split Cells"
 msgstr "Dividir celas"
 
-#. ivMXF
+#. njuVE
 #: 05100200.xhp
 msgctxt ""
 "05100200.xhp\n"
-"hd_id3154654\n"
+"bm_id501632012952361\n"
 "help.text"
-msgid "<link href=\"text/shared/01/05100200.xhp\" name=\"Split Cells\">Split Cells</link>"
-msgstr "<link href=\"text/shared/01/05990000.xhp\" name=\"Texto\">Texto</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>"
-msgstr "Escolla <emph>Táboa - Dividir celas</emph>"
+msgid "<ahelp hid=\".\">Divides previously merged cells back to the original cells. If the original cells had content that was kept when merged  that content is restored.</ahelp>"
+msgstr ""
 
-#. ef6va
+#. qBugU
 #: 05100200.xhp
 msgctxt ""
 "05100200.xhp\n"
-"par_id3154042\n"
+"par_id1001632807096225\n"
 "help.text"
-msgid "On the <emph>Table</emph> Bar, click"
-msgstr "Na barra <emph>Táboa</emph>, prema en"
+msgid "Select the cells to be unmerged then do one of the following:"
+msgstr ""
 
-#. xKWAC
+#. 8HDVx
 #: 05100200.xhp
 msgctxt ""
 "05100200.xhp\n"
-"par_id3147270\n"
+"par_id961632804418168\n"
 "help.text"
-msgid "<image id=\"img_id3147275\" src=\"cmd/sc_splitcell.png\" width=\"0.423cm\" height=\"0.423cm\"><alt id=\"alt_id3147275\">Icon</alt></image>"
-msgstr "<image id=\"img_id3147275\" src=\"cmd/sc_splitcell.png\" width=\"0.423cm\" height=\"0.423cm\"><alt id=\"alt_id3147275\">Icona</alt></image>"
+msgid "In the <emph>Formatting</emph> toolbar click:"
+msgstr ""
 
-#. GfBQk
+#. VvKDu
 #: 05100200.xhp
 msgctxt ""
 "05100200.xhp\n"
-"par_id3150616\n"
+"par_id161632275254217\n"
 "help.text"
-msgid "Split Cells"
-msgstr "Dividir celas"
+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 ""
 
-#. tkVC9
+#. KBJNC
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id3154024\n"
+"help.text"
+msgid "Choose <emph>Table - Split Cells</emph>.<br/>"
+msgstr ""
+
+#. pNAsT
+#: 05100200.xhp
+msgctxt ""
+"05100200.xhp\n"
+"par_id3154042\n"
+"help.text"
+msgid "Or, on the <emph>Table</emph> toolbar click:"
+msgstr ""
+
+#. 4oLAA
 #: 05100200.xhp
 msgctxt ""
 "05100200.xhp\n"
 "hd_id3154558\n"
 "help.text"
-msgid "Split cell into"
-msgstr "Dividir cela en"
+msgid "Split Cells Dialog"
+msgstr ""
 
 #. cDdv6
 #: 05100200.xhp