update translations for master

and force-fix errors using pocheck

Change-Id: Iaf573f747484376b8aeb1854bc5342507a27d92d

1 files changed, 20 insertions, 14 deletions

diff --git a/source/sid/cui/messages.po b/source/sid/cui/messages.po
index a172a5c2042..40b2be70652 100644
--- a/source/sid/cui/messages.po
+++ b/source/sid/cui/messages.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:08+0100\n"
+"POT-Creation-Date: 2021-02-17 15:58+0100\n"
 "PO-Revision-Date: 2018-11-14 11:45+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5951,14 +5951,20 @@ msgctxt "borderpage|mergewithnext"
 msgid "_Merge with next paragraph"
 msgstr "Aantanno borgufora _maka"
 
+#. NGxAw
+#: cui/uiconfig/ui/borderpage.ui:608
+msgctxt "borderpage|mergewithnext"
+msgid "Merge indent, border and shadow style of current paragraph with next paragraph, if they are the same."
+msgstr ""
+
 #. xkm5N
-#: cui/uiconfig/ui/borderpage.ui:616
+#: cui/uiconfig/ui/borderpage.ui:617
 msgctxt "borderpage|mergeadjacent"
 msgid "_Merge adjacent line styles"
 msgstr "Gutu xaadi xuruuru akatta _maka"
 
 #. b2Ym7
-#: cui/uiconfig/ui/borderpage.ui:634
+#: cui/uiconfig/ui/borderpage.ui:635
 msgctxt "borderpage|label12"
 msgid "Properties"
 msgstr "Akatta"
@@ -13173,10 +13179,10 @@ msgctxt "numberingoptionspage|extended_tip|charstyle"
 msgid "Select the Character Style that you want to use in the numbered list."
 msgstr ""
 
-#. UaFF9
+#. C3YUr
 #: cui/uiconfig/ui/numberingoptionspage.ui:202
 msgctxt "numberingoptionspage|extended_tip|sublevels"
-msgid "Enter the number of previous levels to include in the numbering style. For example, if you enter \"2\" and the previous level uses the \"A, B, C...\" numbering style, the numbering scheme for the current level becomes: \"A.1\"."
+msgid "Enter the number of previous levels to include in the numbering scheme. For example, if you enter \"2\" and the previous level uses the \"A, B, C...\" numbering, the numbering scheme for the current level becomes: \"A.1\"."
 msgstr ""
 
 #. ST2Co
@@ -13192,10 +13198,10 @@ msgctxt "numberingoptionspage|startatft"
 msgid "Start at:"
 msgstr "-Wiinni hanafa"
 
-#. QxbQe
+#. PuJvD
 #: cui/uiconfig/ui/numberingoptionspage.ui:249
 msgctxt "numberingoptionspage|extended_tip|numfmtlb"
-msgid "Select a numbering style for the selected levels."
+msgid "Select a numbering scheme for the selected levels."
 msgstr ""
 
 #. EDSiA
@@ -13322,10 +13328,10 @@ msgctxt "numberingoptionspage|extended_tip|bitmap"
 msgid "Select the graphic, or locate the graphic file that you want to use as a bullet."
 msgstr ""
 
-#. NCamZ
+#. nSL3K
 #: cui/uiconfig/ui/numberingoptionspage.ui:435
 msgctxt "numberingoptionspage|extended_tip|color"
-msgid "Select a color for the current numbering style."
+msgid "Select a color for the current numbering scheme."
 msgstr ""
 
 #. hJgCL
@@ -18427,10 +18433,10 @@ msgctxt "pickgraphicpage|extended_tip|PickGraphicPage"
 msgid "Displays the different graphics that you can use as bullets in a bulleted list."
 msgstr ""
 
-#. Qd4sn
+#. q8tMx
 #: cui/uiconfig/ui/picknumberingpage.ui:37
 msgctxt "picknumberingpage|extended_tip|valueset"
-msgid "Click the numbering style that you want to use."
+msgid "Click the numbering scheme that you want to use."
 msgstr ""
 
 #. 9JnpQ
@@ -18439,11 +18445,11 @@ msgctxt "picknumberingpage|label25"
 msgid "Selection"
 msgstr "Doorsha"
 
-#. mQsy5
+#. mkywY
 #: cui/uiconfig/ui/picknumberingpage.ui:58
 msgctxt "picknumberingpage|extended_tip|PickNumberingPage"
-msgid "Displays the different numbering styles that you can apply."
-msgstr "Addi addi kiirishshi akata loosaansa dandaattoha leellishi."
+msgid "Displays the different numbering schemes that you can apply."
+msgstr ""
 
 #. BDFqB
 #: cui/uiconfig/ui/pickoutlinepage.ui:37