update translations for master

and force-fix errors using pocheck

Change-Id: Iaf573f747484376b8aeb1854bc5342507a27d92d

1 files changed, 22 insertions, 16 deletions

diff --git a/source/nb/cui/messages.po b/source/nb/cui/messages.po
index 79e41b578e0..0f4694e9f30 100644
--- a/source/nb/cui/messages.po
+++ b/source/nb/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: 2020-09-09 17:34+0000\n"
 "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <https://weblate.documentfoundation.org/projects/libo_ui-master/cuimessages/nb_NO/>\n"
@@ -5838,14 +5838,20 @@ msgctxt "borderpage|mergewithnext"
 msgid "_Merge with next paragraph"
 msgstr "Slå sammen med neste avsnitt"
 
+#. 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 "Slå sammen nabolinjestiler"
 
 #. b2Ym7
-#: cui/uiconfig/ui/borderpage.ui:634
+#: cui/uiconfig/ui/borderpage.ui:635
 msgctxt "borderpage|label12"
 msgid "Properties"
 msgstr "Egenskaper"
@@ -12823,10 +12829,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
@@ -12841,11 +12847,11 @@ msgctxt "numberingoptionspage|startatft"
 msgid "Start at:"
 msgstr "Start med:"
 
-#. QxbQe
+#. PuJvD
 #: cui/uiconfig/ui/numberingoptionspage.ui:249
 msgctxt "numberingoptionspage|extended_tip|numfmtlb"
-msgid "Select a numbering style for the selected levels."
-msgstr "Velg en nummereringstype du vil bruke på de valgte nivåene."
+msgid "Select a numbering scheme for the selected levels."
+msgstr ""
 
 #. EDSiA
 #: cui/uiconfig/ui/numberingoptionspage.ui:262
@@ -12967,10 +12973,10 @@ msgctxt "numberingoptionspage|extended_tip|bitmap"
 msgid "Select the graphic, or locate the graphic file that you want to use as a bullet."
 msgstr "Velg et bilde eller finn stien til det bildet du vil bruke som punkttegn."
 
-#. 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
@@ -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 ""
 
-#. Qd4sn
+#. q8tMx
 #: cui/uiconfig/ui/picknumberingpage.ui:37
 msgctxt "picknumberingpage|extended_tip|valueset"
-msgid "Click the numbering style that you want to use."
-msgstr "Velg den nummereringa du vil bruke."
+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 "Utvalg"
 
-#. mQsy5
+#. mkywY
 #: cui/uiconfig/ui/picknumberingpage.ui:58
 msgctxt "picknumberingpage|extended_tip|PickNumberingPage"
-msgid "Displays the different numbering styles that you can apply."
-msgstr "Vis de ulike nummereringsstilene du kan ta i bruk."
+msgid "Displays the different numbering schemes that you can apply."
+msgstr ""
 
 #. BDFqB
 #: cui/uiconfig/ui/pickoutlinepage.ui:37