update translations for master

and force-fix errors using pocheck

Change-Id: I5e201f8d1c7746b1612ff10f592d611f402dc72c

1 files changed, 189 insertions, 61 deletions

diff --git a/source/en-ZA/sw/uiconfig/swriter/ui.po b/source/en-ZA/sw/uiconfig/swriter/ui.po
index 29d1c525b24..15bddedbbba 100644
--- a/source/en-ZA/sw/uiconfig/swriter/ui.po
+++ b/source/en-ZA/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-12 08:22+0000\n"
+"POT-Creation-Date: 2015-09-01 20:20+0200\n"
+"PO-Revision-Date: 2015-08-25 21:27+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: none\n"
 "Language: en_ZA\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: 1431418974.000000\n"
+"X-POOTLE-MTIME: 1440538067.000000\n"
 
 #: abstractdialog.ui
 msgctxt ""
@@ -9400,13 +9400,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 "Start at"
 
 #: numparapage.ui
 #, fuzzy
@@ -9984,15 +9985,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"
@@ -12969,6 +12961,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"
@@ -13011,55 +13039,182 @@ msgstr "After"
 #: 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 "Spacing"
+
+#: 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
@@ -14745,7 +14900,7 @@ msgctxt ""
 "TocDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Index/Table"
+msgid "Insert Index or Table of Contents"
 msgstr ""
 
 #: tocdialog.ui
@@ -14763,7 +14918,7 @@ msgctxt ""
 "index\n"
 "label\n"
 "string.text"
-msgid "Index/Table"
+msgid "Index or Table of Contents"
 msgstr ""
 
 #: tocdialog.ui
@@ -15361,7 +15516,7 @@ msgctxt ""
 "label1\n"
 "label\n"
 "string.text"
-msgid "Create Index/Table"
+msgid "Create Index or Table of Contents"
 msgstr ""
 
 #: tocindexpage.ui
@@ -15907,33 +16062,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"
@@ -15943,28 +16071,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