update translations for master

and force-fix errors using pocheck

Change-Id: Iaf573f747484376b8aeb1854bc5342507a27d92d

1 files changed, 24 insertions, 18 deletions

diff --git a/source/en-GB/cui/messages.po b/source/en-GB/cui/messages.po
index 1e3f0a8e898..bc3dc980b45 100644
--- a/source/en-GB/cui/messages.po
+++ b/source/en-GB/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: 2021-02-03 18:01+0000\n"
 "Last-Translator: Stuart Swales <stuart.swales.croftnuisk@gmail.com>\n"
 "Language-Team: English (United Kingdom) <https://translations.documentfoundation.org/projects/libo_ui-master/cuimessages/en_GB/>\n"
@@ -5838,14 +5838,20 @@ msgctxt "borderpage|mergewithnext"
 msgid "_Merge with next paragraph"
 msgstr "_Merge with next paragraph"
 
+#. 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 "_Merge adjacent line styles"
 
 #. b2Ym7
-#: cui/uiconfig/ui/borderpage.ui:634
+#: cui/uiconfig/ui/borderpage.ui:635
 msgctxt "borderpage|label12"
 msgid "Properties"
 msgstr "Properties"
@@ -12823,11 +12829,11 @@ msgctxt "numberingoptionspage|extended_tip|charstyle"
 msgid "Select the Character Style that you want to use in the numbered list."
 msgstr "Select the Character Style that you want to use in the numbered list."
 
-#. 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\"."
-msgstr "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
 #: cui/uiconfig/ui/numberingoptionspage.ui:220
@@ -12841,11 +12847,11 @@ msgctxt "numberingoptionspage|startatft"
 msgid "Start at:"
 msgstr "Start at:"
 
-#. QxbQe
+#. PuJvD
 #: cui/uiconfig/ui/numberingoptionspage.ui:249
 msgctxt "numberingoptionspage|extended_tip|numfmtlb"
-msgid "Select a numbering style for the selected levels."
-msgstr "Select a numbering style for the selected levels."
+msgid "Select a numbering scheme for the selected levels."
+msgstr ""
 
 #. EDSiA
 #: cui/uiconfig/ui/numberingoptionspage.ui:262
@@ -12967,11 +12973,11 @@ msgctxt "numberingoptionspage|extended_tip|bitmap"
 msgid "Select the graphic, or locate the graphic file that you want to use as a bullet."
 msgstr "Select the graphic, or locate the graphic file that you want to use as a bullet."
 
-#. NCamZ
+#. nSL3K
 #: cui/uiconfig/ui/numberingoptionspage.ui:435
 msgctxt "numberingoptionspage|extended_tip|color"
-msgid "Select a color for the current numbering style."
-msgstr "Select a colour for the current numbering style."
+msgid "Select a color for the current numbering scheme."
+msgstr ""
 
 #. hJgCL
 #: cui/uiconfig/ui/numberingoptionspage.ui:453
@@ -17946,11 +17952,11 @@ msgctxt "pickgraphicpage|extended_tip|PickGraphicPage"
 msgid "Displays the different graphics that you can use as bullets in a bulleted list."
 msgstr "Displays the different graphics that you can use as bullets in a bulleted list."
 
-#. Qd4sn
+#. q8tMx
 #: cui/uiconfig/ui/picknumberingpage.ui:37
 msgctxt "picknumberingpage|extended_tip|valueset"
-msgid "Click the numbering style that you want to use."
-msgstr "Click the numbering style that you want to use."
+msgid "Click the numbering scheme that you want to use."
+msgstr ""
 
 #. 9JnpQ
 #: cui/uiconfig/ui/picknumberingpage.ui:50
@@ -17958,11 +17964,11 @@ msgctxt "picknumberingpage|label25"
 msgid "Selection"
 msgstr "Selection"
 
-#. mQsy5
+#. mkywY
 #: cui/uiconfig/ui/picknumberingpage.ui:58
 msgctxt "picknumberingpage|extended_tip|PickNumberingPage"
-msgid "Displays the different numbering styles that you can apply."
-msgstr "Displays the different numbering styles that you can apply."
+msgid "Displays the different numbering schemes that you can apply."
+msgstr ""
 
 #. BDFqB
 #: cui/uiconfig/ui/pickoutlinepage.ui:37