update translations for master

and force-fix errors using pocheck

Change-Id: I5e201f8d1c7746b1612ff10f592d611f402dc72c

3 files changed, 266 insertions, 78 deletions

diff --git a/source/nso/sw/source/ui/app.po b/source/nso/sw/source/ui/app.po
index 7ea1a4791a0..9920ff65b70 100644
--- a/source/nso/sw/source/ui/app.po
+++ b/source/nso/sw/source/ui/app.po
@@ -3,8 +3,8 @@ 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"
-"PO-Revision-Date: 2015-05-13 06:22+0000\n"
+"POT-Creation-Date: 2015-08-25 12:34+0200\n"
+"PO-Revision-Date: 2015-06-26 02:28+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: nso\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: 1431498175.000000\n"
+"X-POOTLE-MTIME: 1435285739.000000\n"
 
 #: app.src
 msgctxt ""
@@ -1144,12 +1144,13 @@ msgid "Password-protected files cannot be opened."
 msgstr "Difaele tše di šireleditšwego ke lentšuphetišo di ka se bulwe."
 
 #: 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 "Ye ga se faele ya Winword6."
 
 #: error.src
@@ -1180,12 +1181,13 @@ msgid "File has been written in a newer version."
 msgstr "Faele e ngwadilwe ka tokollo e mpsha."
 
 #: 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 "Ye ga se faele ya WinWord97."
 
 #: error.src
@@ -1552,34 +1554,31 @@ msgid "Paste ~Special"
 msgstr ""
 
 #: 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 "~Mpshafatša tšhupaditeng/lenaneo"
+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 "~Lokiša tšhupaditeng/lenaneo"
+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 "Phumola tšhupaditeng/lenaneo"
+msgid "Delete Index or Table of Contents"
+msgstr ""
 
 #: mn.src
 msgctxt ""
@@ -2490,3 +2489,49 @@ msgctxt ""
 "menuitem.text"
 msgid "Delete Page Break"
 msgstr "Phumola go ~kgaola ka go itirela"
+
+#, fuzzy
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_UPDATE_CUR_TOX\n"
+"menuitem.text"
+msgid "~Update Index or Table"
+msgstr "~Mpshafatša tšhupaditeng/lenaneo"
+
+#, fuzzy
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_EDIT_CURRENT_TOX\n"
+"menuitem.text"
+msgid "~Edit Index or Table"
+msgstr "~Lokiša tšhupaditeng/lenaneo"
+
+#, fuzzy
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_REMOVE_CUR_TOX\n"
+"menuitem.text"
+msgid "Delete Index or Table"
+msgstr "Phumola tšhupaditeng/lenaneo"
+
+#: 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."
+msgstr "Ye ga se faele ya Winword6."
+
+#: 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 "Ye ga se faele ya WinWord97."
diff --git a/source/nso/sw/source/ui/dochdl.po b/source/nso/sw/source/ui/dochdl.po
index 90e4f543874..be9d6937e38 100644
--- a/source/nso/sw/source/ui/dochdl.po
+++ b/source/nso/sw/source/ui/dochdl.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-04-22 23:40+0200\n"
+"POT-Creation-Date: 2015-08-25 12:34+0200\n"
 "PO-Revision-Date: 2015-05-13 06:23+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 "Lenaneo le ka se tsenywe ka gare ga lenaneo le lengwe. Le ge go le bjalo, o ka kgomaretša tsebišo tokumenteng ge khesara e se lenaneong."
+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 ""
@@ -80,3 +88,10 @@ msgctxt ""
 "string.text"
 msgid "DDE link"
 msgstr "Lomaganyo ya DDE"
+
+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 "Lenaneo le ka se tsenywe ka gare ga lenaneo le lengwe. Le ge go le bjalo, o ka kgomaretša tsebišo tokumenteng ge khesara e se lenaneong."
diff --git a/source/nso/sw/uiconfig/swriter/ui.po b/source/nso/sw/uiconfig/swriter/ui.po
index 55097765592..e65e4a0ed2c 100644
--- a/source/nso/sw/uiconfig/swriter/ui.po
+++ b/source/nso/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 06:27+0000\n"
+"POT-Creation-Date: 2015-09-01 20:20+0200\n"
+"PO-Revision-Date: 2015-08-06 23:03+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: none\n"
 "Language: nso\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: 1431498432.000000\n"
+"X-POOTLE-MTIME: 1438902229.000000\n"
 
 #: abstractdialog.ui
 msgctxt ""
@@ -9402,13 +9402,14 @@ msgid "R_estart at this paragraph"
 msgstr ""
 
 #: numparapage.ui
+#, fuzzy
 msgctxt ""
 "numparapage.ui\n"
 "checkCB_NUMBER_NEW_START\n"
 "label\n"
 "string.text"
 msgid "S_tart with:"
-msgstr ""
+msgstr "~Thoma go"
 
 #: numparapage.ui
 #, fuzzy
@@ -9986,15 +9987,6 @@ msgstr ""
 #: optfonttabpage.ui
 msgctxt ""
 "optfonttabpage.ui\n"
-"doconly\n"
-"label\n"
-"string.text"
-msgid "C_urrent document only"
-msgstr ""
-
-#: optfonttabpage.ui
-msgctxt ""
-"optfonttabpage.ui\n"
 "label1\n"
 "label\n"
 "string.text"
@@ -12966,6 +12958,42 @@ msgid "None"
 msgstr ""
 
 #: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"buttonparallel\n"
+"tooltip_markup\n"
+"string.text"
+msgid "Parallel"
+msgstr ""
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"buttonparallel\n"
+"tooltip_text\n"
+"string.text"
+msgid "Parallel"
+msgstr ""
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"buttonoptimal\n"
+"tooltip_markup\n"
+"string.text"
+msgid "Optimal"
+msgstr ""
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"buttonoptimal\n"
+"tooltip_text\n"
+"string.text"
+msgid "Optimal"
+msgstr ""
+
+#: sidebarwrap.ui
 #, fuzzy
 msgctxt ""
 "sidebarwrap.ui\n"
@@ -13008,55 +13036,182 @@ msgstr "Ka morago"
 #: sidebarwrap.ui
 msgctxt ""
 "sidebarwrap.ui\n"
-"buttonparallel\n"
+"buttonthrough\n"
 "tooltip_markup\n"
 "string.text"
-msgid "Parallel"
+msgid "Through"
 msgstr ""
 
 #: sidebarwrap.ui
 msgctxt ""
 "sidebarwrap.ui\n"
-"buttonparallel\n"
+"buttonthrough\n"
 "tooltip_text\n"
 "string.text"
-msgid "Parallel"
+msgid "Through"
 msgstr ""
 
 #: 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"
+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"
+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"
+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"
+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 "Katoganyo"
+
+#: 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
+msgctxt ""
+"sidebarwrap.ui\n"
+"spacinglist\n"
+"0\n"
+"stringlist.text"
+msgid "None"
+msgstr ""
+
+#: 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
@@ -14738,7 +14893,7 @@ msgctxt ""
 "TocDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Index/Table"
+msgid "Insert Index or Table of Contents"
 msgstr ""
 
 #: tocdialog.ui
@@ -14756,7 +14911,7 @@ msgctxt ""
 "index\n"
 "label\n"
 "string.text"
-msgid "Index/Table"
+msgid "Index or Table of Contents"
 msgstr ""
 
 #: tocdialog.ui
@@ -15354,7 +15509,7 @@ msgctxt ""
 "label1\n"
 "label\n"
 "string.text"
-msgid "Create Index/Table"
+msgid "Create Index or Table of Contents"
 msgstr ""
 
 #: tocindexpage.ui
@@ -15900,33 +16055,6 @@ msgstr ""
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"hscrollbar\n"
-"label\n"
-"string.text"
-msgid "H_orizontal scrollbar"
-msgstr ""
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
-"vscrollbar\n"
-"label\n"
-"string.text"
-msgid "_Vertical scrollbar"
-msgstr ""
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
-"ruler\n"
-"label\n"
-"string.text"
-msgid "R_uler"
-msgstr ""
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
 "smoothscroll\n"
 "label\n"
 "string.text"
@@ -15936,28 +16064,28 @@ msgstr ""
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"hruler\n"
+"vruler\n"
 "label\n"
 "string.text"
-msgid "Hori_zontal ruler"
+msgid "Verti_cal ruler"
 msgstr ""
 
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"vruler\n"
+"vrulerright\n"
 "label\n"
 "string.text"
-msgid "Verti_cal ruler"
+msgid "Right-aligned"
 msgstr ""
 
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"vrulerright\n"
+"hruler\n"
 "label\n"
 "string.text"
-msgid "Right-aligned"
+msgid "Hori_zontal ruler"
 msgstr ""
 
 #: viewoptionspage.ui