update translations for master

and force-fix errors using pocheck

Change-Id: I5e201f8d1c7746b1612ff10f592d611f402dc72c

3 files changed, 267 insertions, 80 deletions

diff --git a/source/sid/sw/source/ui/app.po b/source/sid/sw/source/ui/app.po
index 2b09b7aa097..477063090a7 100644
--- a/source/sid/sw/source/ui/app.po
+++ b/source/sid/sw/source/ui/app.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LO4-1\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 16:40+0000\n"
+"POT-Creation-Date: 2015-08-25 12:34+0200\n"
+"PO-Revision-Date: 2015-06-26 03:26+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: Sidama translators\n"
 "Language: sid\n"
@@ -15,7 +15,7 @@ msgstr ""
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
 "X-Project-Style: openoffice\n"
-"X-POOTLE-MTIME: 1431535237.000000\n"
+"X-POOTLE-MTIME: 1435289163.000000\n"
 
 #: app.src
 msgctxt ""
@@ -1143,12 +1143,13 @@ msgid "Password-protected files cannot be opened."
 msgstr "Maaxo gargarantino fayilla fa'nama didandiitanno."
 
 #: 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 "Tini WinWord6 fayle dikkitino."
 
 #: error.src
@@ -1179,12 +1180,13 @@ msgid "File has been written in a newer version."
 msgstr "Fayle haaru laalchi giddo borreessantino."
 
 #: 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 "Tini  WinWord97 fayle dikkitino."
 
 #: error.src
@@ -1535,34 +1537,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 "Taji-mashalaqqisaancho/shae ~Yanneessi"
+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 "Taji-mashalaqqisaancho/shae ~Mucceessi"
+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 "Taji-mashalaqqisaancho/shae Huni"
+msgid "Delete Index or Table of Contents"
+msgstr ""
 
 #: mn.src
 msgctxt ""
@@ -2468,3 +2467,48 @@ msgctxt ""
 "menuitem.text"
 msgid "Delete Page Break"
 msgstr "Qoolu Tayso Huni"
+
+#, fuzzy
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_UPDATE_CUR_TOX\n"
+"menuitem.text"
+msgid "~Update Index or Table"
+msgstr "Taji-mashalaqqisaancho/shae ~Yanneessi"
+
+#, fuzzy
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_EDIT_CURRENT_TOX\n"
+"menuitem.text"
+msgid "~Edit Index or Table"
+msgstr "Taji-mashalaqqisaancho/shae ~Mucceessi"
+
+#, fuzzy
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_REMOVE_CUR_TOX\n"
+"menuitem.text"
+msgid "Delete Index or Table"
+msgstr "Taji-mashalaqqisaancho/shae Huni"
+
+#: 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 "Tini WinWord6 fayle dikkitino."
+
+#: 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 "Tini  WinWord97 fayle dikkitino."
diff --git a/source/sid/sw/source/ui/dochdl.po b/source/sid/sw/source/ui/dochdl.po
index 73537d50d36..85b62533df4 100644
--- a/source/sid/sw/source/ui/dochdl.po
+++ b/source/sid/sw/source/ui/dochdl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LO4-1\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 16:41+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: Sidama translators\n"
@@ -30,8 +30,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 "Shae wole shaera surkama didandiitanno. Ikkollana, Wirsu shaete giddo nooki wote bortajete giddora daata qa'misa dandaatto."
+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 ""
@@ -81,3 +89,10 @@ msgctxt ""
 "string.text"
 msgid "DDE link"
 msgstr "DDE xaadooshshe"
+
+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 "Shae wole shaera surkama didandiitanno. Ikkollana, Wirsu shaete giddo nooki wote bortajete giddora daata qa'misa dandaatto."
diff --git a/source/sid/sw/uiconfig/swriter/ui.po b/source/sid/sw/uiconfig/swriter/ui.po
index c7bcd3a8676..2f15d49f357 100644
--- a/source/sid/sw/uiconfig/swriter/ui.po
+++ b/source/sid/sw/uiconfig/swriter/ui.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LO4-1\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 16:47+0000\n"
+"POT-Creation-Date: 2015-09-01 20:20+0200\n"
+"PO-Revision-Date: 2015-08-06 23:16+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: none\n"
 "Language: sid\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: 1431535678.000000\n"
+"X-POOTLE-MTIME: 1438902960.000000\n"
 
 #: abstractdialog.ui
 msgctxt ""
@@ -9897,15 +9897,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"
@@ -12864,6 +12855,42 @@ msgstr "Mittunkuri"
 #: 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
+msgctxt ""
+"sidebarwrap.ui\n"
 "buttonbefore\n"
 "tooltip_markup\n"
 "string.text"
@@ -12900,55 +12927,183 @@ msgstr "Gedensaanni"
 #: 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 "Foonqe"
+
+#: 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 "Mittunkuri"
+
+#: 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
@@ -14592,7 +14747,7 @@ msgctxt ""
 "TocDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Index/Table"
+msgid "Insert Index or Table of Contents"
 msgstr ""
 
 #: tocdialog.ui
@@ -14610,7 +14765,7 @@ msgctxt ""
 "index\n"
 "label\n"
 "string.text"
-msgid "Index/Table"
+msgid "Index or Table of Contents"
 msgstr ""
 
 #: tocdialog.ui
@@ -15196,7 +15351,7 @@ msgctxt ""
 "label1\n"
 "label\n"
 "string.text"
-msgid "Create Index/Table"
+msgid "Create Index or Table of Contents"
 msgstr ""
 
 #: tocindexpage.ui
@@ -15744,33 +15899,6 @@ msgstr "Leellishi"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"hscrollbar\n"
-"label\n"
-"string.text"
-msgid "H_orizontal scrollbar"
-msgstr "Haawiittaamo goshooshami-gaxa"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
-"vscrollbar\n"
-"label\n"
-"string.text"
-msgid "_Vertical scrollbar"
-msgstr "_Hossicha goshooshami-gaxa"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
-"ruler\n"
-"label\n"
-"string.text"
-msgid "R_uler"
-msgstr "Xuruuraasinco"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
 "smoothscroll\n"
 "label\n"
 "string.text"
@@ -15780,15 +15908,6 @@ msgstr "Taalashsho goshooshama"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"hruler\n"
-"label\n"
-"string.text"
-msgid "Hori_zontal ruler"
-msgstr "Haawiitto xuruuraasincho"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
 "vruler\n"
 "label\n"
 "string.text"
@@ -15807,6 +15926,15 @@ msgstr "Qiniiti-dirancho"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
+"hruler\n"
+"label\n"
+"string.text"
+msgid "Hori_zontal ruler"
+msgstr "Haawiitto xuruuraasincho"
+
+#: viewoptionspage.ui
+msgctxt ""
+"viewoptionspage.ui\n"
 "label3\n"
 "label\n"
 "string.text"