update translations for master

and force-fix errors using pocheck

Change-Id: I5e201f8d1c7746b1612ff10f592d611f402dc72c

4 files changed, 284 insertions, 97 deletions

diff --git a/source/nb/sw/source/core/undo.po b/source/nb/sw/source/core/undo.po
index 918718b0e54..298586ba688 100644
--- a/source/nb/sw/source/core/undo.po
+++ b/source/nb/sw/source/core/undo.po
@@ -3,18 +3,18 @@ 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: 2014-05-02 00:02+0200\n"
-"PO-Revision-Date: 2014-05-07 22:00+0000\n"
-"Last-Translator: Olav <odahlum@gmail.com>\n"
+"POT-Creation-Date: 2015-04-22 23:40+0200\n"
+"PO-Revision-Date: 2015-08-22 07:04+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.5.1\n"
+"X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1399500045.000000\n"
+"X-POOTLE-MTIME: 1440227058.000000\n"
 
 #: undo.src
 msgctxt ""
@@ -982,7 +982,7 @@ msgctxt ""
 "STR_UNDO_PAGEDESC_RENAME\n"
 "string.text"
 msgid "Rename page style: $1 $2 $3"
-msgstr "Gi nytt navn til sidestil: $1"
+msgstr "Gi nytt navn til sidestil: $1 $2 $3"
 
 #: undo.src
 msgctxt ""
diff --git a/source/nb/sw/source/ui/app.po b/source/nb/sw/source/ui/app.po
index 6a7f916230c..db312d60b46 100644
--- a/source/nb/sw/source/ui/app.po
+++ b/source/nb/sw/source/ui/app.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: 2015-06-24 17:05+0200\n"
-"PO-Revision-Date: 2015-05-13 03:35+0000\n"
+"POT-Creation-Date: 2015-08-25 12:34+0200\n"
+"PO-Revision-Date: 2015-06-26 02:37+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: British English <>\n"
 "Language: nb\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1431488104.000000\n"
+"X-POOTLE-MTIME: 1435286270.000000\n"
 
 #: app.src
 msgctxt ""
@@ -1142,12 +1142,13 @@ msgid "Password-protected files cannot be opened."
 msgstr "Støtter ikke passordbeskyttede filer."
 
 #: error.src
+#, fuzzy
 msgctxt ""
 "error.src\n"
 "RID_SW_ERRHDL\n"
 "ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_NO_WW6_FILE_ERR )\n"
 "string.text"
-msgid "This is not a WinWord6 file."
+msgid "This is not a valid WinWord6 file."
 msgstr "Dette er ikke en WinWord6-fil."
 
 #: error.src
@@ -1178,12 +1179,13 @@ msgid "File has been written in a newer version."
 msgstr "Det er lagret en ny versjon av denne fila."
 
 #: error.src
+#, fuzzy
 msgctxt ""
 "error.src\n"
 "RID_SW_ERRHDL\n"
 "ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW8_NO_WW8_FILE_ERR )\n"
 "string.text"
-msgid "This is not a WinWord97 file."
+msgid "This is not a valid WinWord97 file."
 msgstr "Dette er ikke en WinWord97-fil."
 
 #: error.src
@@ -1534,34 +1536,31 @@ msgid "Paste ~Special"
 msgstr "~Lim inn utvalg"
 
 #: mn.src
-#, fuzzy
 msgctxt ""
 "mn.src\n"
 "BASE_TEXT_POPUPMENU_NOWEB\n"
 "FN_UPDATE_CUR_TOX\n"
 "menuitem.text"
-msgid "~Update Index or Table"
-msgstr "O~ppdater register/innholdsliste"
+msgid "~Update Index or Table of Contents"
+msgstr ""
 
 #: mn.src
-#, fuzzy
 msgctxt ""
 "mn.src\n"
 "BASE_TEXT_POPUPMENU_NOWEB\n"
 "FN_EDIT_CURRENT_TOX\n"
 "menuitem.text"
-msgid "~Edit Index or Table"
-msgstr "~Rediger register/innholdsliste"
+msgid "~Edit Index or Table of Contents"
+msgstr ""
 
 #: mn.src
-#, fuzzy
 msgctxt ""
 "mn.src\n"
 "BASE_TEXT_POPUPMENU_NOWEB\n"
 "FN_REMOVE_CUR_TOX\n"
 "menuitem.text"
-msgid "Delete Index or Table"
-msgstr "Slett register/innholdsliste"
+msgid "Delete Index or Table of Contents"
+msgstr ""
 
 #: mn.src
 msgctxt ""
@@ -2468,3 +2467,48 @@ msgctxt ""
 "menuitem.text"
 msgid "Delete Page Break"
 msgstr "Slett sideskift"
+
+#, fuzzy
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_UPDATE_CUR_TOX\n"
+"menuitem.text"
+msgid "~Update Index or Table"
+msgstr "O~ppdater register/innholdsliste"
+
+#, fuzzy
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_EDIT_CURRENT_TOX\n"
+"menuitem.text"
+msgid "~Edit Index or Table"
+msgstr "~Rediger register/innholdsliste"
+
+#, fuzzy
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_REMOVE_CUR_TOX\n"
+"menuitem.text"
+msgid "Delete Index or Table"
+msgstr "Slett register/innholdsliste"
+
+#: error.src
+msgctxt ""
+"error.src\n"
+"RID_SW_ERRHDL\n"
+"ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW6_NO_WW6_FILE_ERR )\n"
+"string.text"
+msgid "This is not a WinWord6 file."
+msgstr "Dette er ikke en WinWord6-fil."
+
+#: error.src
+msgctxt ""
+"error.src\n"
+"RID_SW_ERRHDL\n"
+"ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW8_NO_WW8_FILE_ERR )\n"
+"string.text"
+msgid "This is not a WinWord97 file."
+msgstr "Dette er ikke en WinWord97-fil."
diff --git a/source/nb/sw/source/ui/dochdl.po b/source/nb/sw/source/ui/dochdl.po
index e88515f906c..478a4cdf060 100644
--- a/source/nb/sw/source/ui/dochdl.po
+++ b/source/nb/sw/source/ui/dochdl.po
@@ -3,16 +3,16 @@ 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: 2014-11-18 11:23+0100\n"
+"POT-Creation-Date: 2015-08-25 12:34+0200\n"
 "PO-Revision-Date: 2015-02-04 23:54+0000\n"
-"Last-Translator: Olav <odahlum@gmail.com>\n"
+"Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
 "X-POOTLE-MTIME: 1423094066.000000\n"
 
@@ -29,8 +29,16 @@ msgctxt ""
 "dochdl.src\n"
 "STR_NO_TABLE\n"
 "string.text"
-msgid "A table cannot be inserted into another table. However, you can paste the data into the document when the cursor is not in a table."
-msgstr "Det er ikke mulig å sette inn en tabell nå. Du kan lime inn dataene i dokumentet når skrivemerket ikke er i tabellen."
+msgid "A table with no rows or no cells cannot be inserted"
+msgstr ""
+
+#: dochdl.src
+msgctxt ""
+"dochdl.src\n"
+"STR_TABLE_TOO_LARGE\n"
+"string.text"
+msgid "The table cannot be inserted because it is too large"
+msgstr ""
 
 #: dochdl.src
 msgctxt ""
@@ -79,3 +87,10 @@ msgctxt ""
 "string.text"
 msgid "DDE link"
 msgstr "DDE-lenke"
+
+msgctxt ""
+"dochdl.src\n"
+"STR_NO_TABLE\n"
+"string.text"
+msgid "A table cannot be inserted into another table. However, you can paste the data into the document when the cursor is not in a table."
+msgstr "Det er ikke mulig å sette inn en tabell nå. Du kan lime inn dataene i dokumentet når skrivemerket ikke er i tabellen."
diff --git a/source/nb/sw/uiconfig/swriter/ui.po b/source/nb/sw/uiconfig/swriter/ui.po
index 73d19b639a9..b3b5f42c488 100644
--- a/source/nb/sw/uiconfig/swriter/ui.po
+++ b/source/nb/sw/uiconfig/swriter/ui.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibO 40l10n\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2015-08-06 22:51+0200\n"
-"PO-Revision-Date: 2015-05-13 03:38+0000\n"
+"POT-Creation-Date: 2015-09-01 20:20+0200\n"
+"PO-Revision-Date: 2015-08-06 23:10+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: British English <>\n"
 "Language: nb\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1431488300.000000\n"
+"X-POOTLE-MTIME: 1438902626.000000\n"
 
 #: abstractdialog.ui
 msgctxt ""
@@ -9754,15 +9754,6 @@ msgstr "_Register:"
 #: optfonttabpage.ui
 msgctxt ""
 "optfonttabpage.ui\n"
-"doconly\n"
-"label\n"
-"string.text"
-msgid "C_urrent document only"
-msgstr "Kun det _gjeldende dokumentet"
-
-#: optfonttabpage.ui
-msgctxt ""
-"optfonttabpage.ui\n"
 "label1\n"
 "label\n"
 "string.text"
@@ -12686,6 +12677,42 @@ msgstr "Ingen"
 #: sidebarwrap.ui
 msgctxt ""
 "sidebarwrap.ui\n"
+"buttonparallel\n"
+"tooltip_markup\n"
+"string.text"
+msgid "Parallel"
+msgstr "Parallell"
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"buttonparallel\n"
+"tooltip_text\n"
+"string.text"
+msgid "Parallel"
+msgstr "Parallell"
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"buttonoptimal\n"
+"tooltip_markup\n"
+"string.text"
+msgid "Optimal"
+msgstr "Optimal"
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"buttonoptimal\n"
+"tooltip_text\n"
+"string.text"
+msgid "Optimal"
+msgstr "Optimal"
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
 "buttonbefore\n"
 "tooltip_markup\n"
 "string.text"
@@ -12722,56 +12749,184 @@ msgstr "Etter"
 #: sidebarwrap.ui
 msgctxt ""
 "sidebarwrap.ui\n"
-"buttonparallel\n"
+"buttonthrough\n"
 "tooltip_markup\n"
 "string.text"
-msgid "Parallel"
-msgstr "Parallell"
+msgid "Through"
+msgstr "Gjennom"
 
 #: sidebarwrap.ui
 msgctxt ""
 "sidebarwrap.ui\n"
-"buttonparallel\n"
+"buttonthrough\n"
 "tooltip_text\n"
 "string.text"
-msgid "Parallel"
-msgstr "Parallell"
+msgid "Through"
+msgstr "Gjennom"
 
 #: sidebarwrap.ui
 msgctxt ""
 "sidebarwrap.ui\n"
-"buttonthrough\n"
+"enablecontour\n"
+"label\n"
+"string.text"
+msgid "Enable Contour"
+msgstr ""
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"enablecontour\n"
 "tooltip_markup\n"
 "string.text"
-msgid "Through"
-msgstr "Gjennom"
+msgid "Click to automatically trim unnecessary parts of the image"
+msgstr ""
 
 #: sidebarwrap.ui
 msgctxt ""
 "sidebarwrap.ui\n"
-"buttonthrough\n"
+"enablecontour\n"
 "tooltip_text\n"
 "string.text"
-msgid "Through"
-msgstr "Gjennom"
+msgid "Click to automatically trim unnecessary parts of the image"
+msgstr ""
 
 #: sidebarwrap.ui
 msgctxt ""
 "sidebarwrap.ui\n"
-"buttonoptimal\n"
+"editcontour\n"
+"label\n"
+"string.text"
+msgid "Edit Contour"
+msgstr ""
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"editcontour\n"
 "tooltip_markup\n"
 "string.text"
-msgid "Optimal"
-msgstr "Optimal"
+msgid "Edit the trimmed area of the image"
+msgstr ""
 
 #: sidebarwrap.ui
 msgctxt ""
 "sidebarwrap.ui\n"
-"buttonoptimal\n"
+"editcontour\n"
 "tooltip_text\n"
 "string.text"
-msgid "Optimal"
-msgstr "Optimal"
+msgid "Edit the trimmed area of the image"
+msgstr ""
+
+#: sidebarwrap.ui
+#, fuzzy
+msgctxt ""
+"sidebarwrap.ui\n"
+"label1\n"
+"label\n"
+"string.text"
+msgid "Spacing:"
+msgstr "Avstand:"
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"spacingLB\n"
+"tooltip_markup\n"
+"string.text"
+msgid "Set the amount of space between the image and surrounding text"
+msgstr ""
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"spacingLB\n"
+"tooltip_text\n"
+"string.text"
+msgid "Set the amount of space between the image and surrounding text"
+msgstr ""
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"customlabel\n"
+"label\n"
+"string.text"
+msgid "Custom"
+msgstr ""
+
+#: sidebarwrap.ui
+#, fuzzy
+msgctxt ""
+"sidebarwrap.ui\n"
+"spacinglist\n"
+"0\n"
+"stringlist.text"
+msgid "None"
+msgstr "Ingen"
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"spacinglist\n"
+"1\n"
+"stringlist.text"
+msgid "Extra Small (0.16cm)"
+msgstr ""
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"spacinglist\n"
+"2\n"
+"stringlist.text"
+msgid "Small (0.32cm)"
+msgstr ""
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"spacinglist\n"
+"3\n"
+"stringlist.text"
+msgid "Small Medium (0.64cm)"
+msgstr ""
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"spacinglist\n"
+"4\n"
+"stringlist.text"
+msgid "Medium (0.95cm)"
+msgstr ""
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"spacinglist\n"
+"5\n"
+"stringlist.text"
+msgid "Medium Large (1.27cm)"
+msgstr ""
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"spacinglist\n"
+"6\n"
+"stringlist.text"
+msgid "Large (1.9cm)"
+msgstr ""
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"spacinglist\n"
+"7\n"
+"stringlist.text"
+msgid "Extra Large (2.54cm)"
+msgstr ""
 
 #: sortdialog.ui
 msgctxt ""
@@ -14399,8 +14554,8 @@ msgctxt ""
 "TocDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Index/Table"
-msgstr "Sett inn register/innholdsliste"
+msgid "Insert Index or Table of Contents"
+msgstr ""
 
 #: tocdialog.ui
 msgctxt ""
@@ -14417,8 +14572,8 @@ msgctxt ""
 "index\n"
 "label\n"
 "string.text"
-msgid "Index/Table"
-msgstr "Register/innholdsliste"
+msgid "Index or Table of Contents"
+msgstr ""
 
 #: tocdialog.ui
 msgctxt ""
@@ -14993,8 +15148,8 @@ msgctxt ""
 "label1\n"
 "label\n"
 "string.text"
-msgid "Create Index/Table"
-msgstr "Lag register/innholdsliste"
+msgid "Create Index or Table of Contents"
+msgstr ""
 
 #: tocindexpage.ui
 msgctxt ""
@@ -15531,33 +15686,6 @@ msgstr "Visning"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"hscrollbar\n"
-"label\n"
-"string.text"
-msgid "H_orizontal scrollbar"
-msgstr "_Vannrett rullefelt"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
-"vscrollbar\n"
-"label\n"
-"string.text"
-msgid "_Vertical scrollbar"
-msgstr "_Loddrett rullefelt"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
-"ruler\n"
-"label\n"
-"string.text"
-msgid "R_uler"
-msgstr "_Linjal"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
 "smoothscroll\n"
 "label\n"
 "string.text"
@@ -15567,15 +15695,6 @@ msgstr "_Jevn rulling"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"hruler\n"
-"label\n"
-"string.text"
-msgid "Hori_zontal ruler"
-msgstr "_Vannrett linjal"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
 "vruler\n"
 "label\n"
 "string.text"
@@ -15594,6 +15713,15 @@ msgstr "Høyrejustert"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
+"hruler\n"
+"label\n"
+"string.text"
+msgid "Hori_zontal ruler"
+msgstr "_Vannrett linjal"
+
+#: viewoptionspage.ui
+msgctxt ""
+"viewoptionspage.ui\n"
 "label3\n"
 "label\n"
 "string.text"