update translations for master

and force-fix errors using pocheck

Change-Id: I5e201f8d1c7746b1612ff10f592d611f402dc72c

3 files changed, 273 insertions, 87 deletions

diff --git a/source/nn/sw/source/ui/app.po b/source/nn/sw/source/ui/app.po
index 4a2490431eb..5cdaa994186 100644
--- a/source/nn/sw/source/ui/app.po
+++ b/source/nn/sw/source/ui/app.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: 2015-06-24 17:05+0200\n"
+"POT-Creation-Date: 2015-08-25 12:34+0200\n"
 "PO-Revision-Date: 2015-07-18 13:10+0000\n"
 "Last-Translator: Kolbjørn Stuestøl <kolbjoern@stuestoel.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1142,12 +1142,13 @@ msgid "Password-protected files cannot be opened."
 msgstr "Støttar ikkje passordverna 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 inga WinWord6-fil."
 
 #: error.src
@@ -1178,12 +1179,13 @@ msgid "File has been written in a newer version."
 msgstr "Det er lagra ein 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 inga WinWord97-fil."
 
 #: error.src
@@ -1538,8 +1540,8 @@ msgctxt ""
 "BASE_TEXT_POPUPMENU_NOWEB\n"
 "FN_UPDATE_CUR_TOX\n"
 "menuitem.text"
-msgid "~Update Index or Table"
-msgstr "O~ppdater register/innhaldsliste"
+msgid "~Update Index or Table of Contents"
+msgstr ""
 
 #: mn.src
 msgctxt ""
@@ -1547,8 +1549,8 @@ msgctxt ""
 "BASE_TEXT_POPUPMENU_NOWEB\n"
 "FN_EDIT_CURRENT_TOX\n"
 "menuitem.text"
-msgid "~Edit Index or Table"
-msgstr "~Rediger register/innhaldsliste"
+msgid "~Edit Index or Table of Contents"
+msgstr ""
 
 #: mn.src
 msgctxt ""
@@ -1556,8 +1558,8 @@ msgctxt ""
 "BASE_TEXT_POPUPMENU_NOWEB\n"
 "FN_REMOVE_CUR_TOX\n"
 "menuitem.text"
-msgid "Delete Index or Table"
-msgstr "Slett register/innhaldsliste"
+msgid "Delete Index or Table of Contents"
+msgstr ""
 
 #: mn.src
 msgctxt ""
@@ -2457,3 +2459,45 @@ msgctxt ""
 "menuitem.text"
 msgid "Delete Page Break"
 msgstr "Slett sideskift"
+
+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/innhaldsliste"
+
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_EDIT_CURRENT_TOX\n"
+"menuitem.text"
+msgid "~Edit Index or Table"
+msgstr "~Rediger register/innhaldsliste"
+
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_REMOVE_CUR_TOX\n"
+"menuitem.text"
+msgid "Delete Index or Table"
+msgstr "Slett register/innhaldsliste"
+
+#: 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 inga 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 inga WinWord97-fil."
diff --git a/source/nn/sw/source/ui/dochdl.po b/source/nn/sw/source/ui/dochdl.po
index 2e2f4995b7a..6a0021ea29d 100644
--- a/source/nn/sw/source/ui/dochdl.po
+++ b/source/nn/sw/source/ui/dochdl.po
@@ -3,9 +3,9 @@ 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: 2015-04-22 23:40+0200\n"
+"POT-Creation-Date: 2015-08-25 12:34+0200\n"
 "PO-Revision-Date: 2015-07-16 20:53+0000\n"
-"Last-Translator: Kolbjørn Stuestøl <kolbjoern@stuestoel.no>\n"
+"Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nn\n"
 "MIME-Version: 1.0\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 ikkje mogleg å setja inn ein tabell i ein annan. Du kan likevel lima inn i dokumentet når skrivemerket ikkje står i ein tabell."
+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-lenkje"
+
+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 ikkje mogleg å setja inn ein tabell i ein annan. Du kan likevel lima inn i dokumentet når skrivemerket ikkje står i ein tabell."
diff --git a/source/nn/sw/uiconfig/swriter/ui.po b/source/nn/sw/uiconfig/swriter/ui.po
index 2ac42be7738..37840c4a770 100644
--- a/source/nn/sw/uiconfig/swriter/ui.po
+++ b/source/nn/sw/uiconfig/swriter/ui.po
@@ -3,9 +3,9 @@ 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-07-25 18:54+0000\n"
-"Last-Translator: Kolbjørn Stuestøl <kolbjoern@stuestoel.no>\n"
+"POT-Creation-Date: 2015-09-01 20:20+0200\n"
+"PO-Revision-Date: 2015-08-13 18:22+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: none\n"
 "Language: nn\n"
 "MIME-Version: 1.0\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: 1437850495.000000\n"
+"X-POOTLE-MTIME: 1439490156.000000\n"
 
 #: abstractdialog.ui
 msgctxt ""
@@ -9753,15 +9753,6 @@ msgstr "_Register:"
 #: optfonttabpage.ui
 msgctxt ""
 "optfonttabpage.ui\n"
-"doconly\n"
-"label\n"
-"string.text"
-msgid "C_urrent document only"
-msgstr "Berre _gjeldande dokument"
-
-#: optfonttabpage.ui
-msgctxt ""
-"optfonttabpage.ui\n"
 "label1\n"
 "label\n"
 "string.text"
@@ -10597,7 +10588,6 @@ msgid "Colu_mn:"
 msgstr "K_olonne:"
 
 #: opttablepage.ui
-#, fuzzy
 msgctxt ""
 "opttablepage.ui\n"
 "label14\n"
@@ -12683,6 +12673,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"
@@ -12719,56 +12745,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 ""
@@ -14396,8 +14550,8 @@ msgctxt ""
 "TocDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Index/Table"
-msgstr "Set inn register/innhaldsliste"
+msgid "Insert Index or Table of Contents"
+msgstr ""
 
 #: tocdialog.ui
 msgctxt ""
@@ -14414,8 +14568,8 @@ msgctxt ""
 "index\n"
 "label\n"
 "string.text"
-msgid "Index/Table"
-msgstr "Register/innhaldsliste"
+msgid "Index or Table of Contents"
+msgstr ""
 
 #: tocdialog.ui
 msgctxt ""
@@ -14990,8 +15144,8 @@ msgctxt ""
 "label1\n"
 "label\n"
 "string.text"
-msgid "Create Index/Table"
-msgstr "Lag register/innhaldsliste"
+msgid "Create Index or Table of Contents"
+msgstr ""
 
 #: tocindexpage.ui
 msgctxt ""
@@ -15527,33 +15681,6 @@ msgstr "Vising"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"hscrollbar\n"
-"label\n"
-"string.text"
-msgid "H_orizontal scrollbar"
-msgstr "_Vassrett 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"
@@ -15563,15 +15690,6 @@ msgstr "_Jamn rulling"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"hruler\n"
-"label\n"
-"string.text"
-msgid "Hori_zontal ruler"
-msgstr "_Vassrett linjal"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
 "vruler\n"
 "label\n"
 "string.text"
@@ -15590,6 +15708,15 @@ msgstr "Høgrejustert"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
+"hruler\n"
+"label\n"
+"string.text"
+msgid "Hori_zontal ruler"
+msgstr "_Vassrett linjal"
+
+#: viewoptionspage.ui
+msgctxt ""
+"viewoptionspage.ui\n"
 "label3\n"
 "label\n"
 "string.text"