update translations for master

and force-fix errors using pocheck

Change-Id: I5e201f8d1c7746b1612ff10f592d611f402dc72c

3 files changed, 227 insertions, 91 deletions

diff --git a/source/cy/sw/source/ui/app.po b/source/cy/sw/source/ui/app.po
index 20d0527b021..968076920fe 100644
--- a/source/cy/sw/source/ui/app.po
+++ b/source/cy/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-07-15 14:44+0000\n"
+"POT-Creation-Date: 2015-08-25 12:34+0200\n"
+"PO-Revision-Date: 2015-08-27 08:12+0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1436971489.000000\n"
+"X-POOTLE-MTIME: 1440663133.000000\n"
 
 #: app.src
 msgctxt ""
@@ -1147,7 +1147,7 @@ msgctxt ""
 "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 "Nid ffeil Winword6 yw hwn."
 
 #: error.src
@@ -1183,7 +1183,7 @@ msgctxt ""
 "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 "Nid ffeil WinWord97 yw hon."
 
 #: error.src
@@ -1538,8 +1538,8 @@ msgctxt ""
 "BASE_TEXT_POPUPMENU_NOWEB\n"
 "FN_UPDATE_CUR_TOX\n"
 "menuitem.text"
-msgid "~Update Index or Table"
-msgstr "~Diweddaru Mynegai neu Dabl"
+msgid "~Update Index or Table of Contents"
+msgstr "~Diweddaru Mynegai neu Dabl Cynnwys"
 
 #: mn.src
 msgctxt ""
@@ -1547,8 +1547,8 @@ msgctxt ""
 "BASE_TEXT_POPUPMENU_NOWEB\n"
 "FN_EDIT_CURRENT_TOX\n"
 "menuitem.text"
-msgid "~Edit Index or Table"
-msgstr "~Golygu Mynegai neu Dabl"
+msgid "~Edit Index or Table of Contents"
+msgstr "~Golygu Mynegai neu Dabl Cynnwys"
 
 #: mn.src
 msgctxt ""
@@ -1556,8 +1556,8 @@ msgctxt ""
 "BASE_TEXT_POPUPMENU_NOWEB\n"
 "FN_REMOVE_CUR_TOX\n"
 "menuitem.text"
-msgid "Delete Index or Table"
-msgstr "Dileu Mynegai neu Dabl"
+msgid "Delete Index or Table of Contents"
+msgstr "Dileu Mynegai neu Dabl Cynnwys"
 
 #: mn.src
 msgctxt ""
diff --git a/source/cy/sw/source/ui/dochdl.po b/source/cy/sw/source/ui/dochdl.po
index 10747e70ba9..1fe4418d7fe 100644
--- a/source/cy/sw/source/ui/dochdl.po
+++ b/source/cy/sw/source/ui/dochdl.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-11-18 11:23+0100\n"
-"PO-Revision-Date: 2015-01-22 11:56+0000\n"
-"Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
+"POT-Creation-Date: 2015-08-25 12:34+0200\n"
+"PO-Revision-Date: 2015-08-27 08:12+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: cy\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==2) ? 1 : 0;\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1421927785.000000\n"
+"X-POOTLE-MTIME: 1440663179.000000\n"
 
 #: dochdl.src
 msgctxt ""
@@ -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 "Nid oes modd mewnosod tabl i dabl arall. Er hynny, mae modd gludo'r data i'r ddogfen pan nad yw'r cyrchwr ar y tabl."
+msgid "A table with no rows or no cells cannot be inserted"
+msgstr "Nid oes modd mewnosod tabl sydd heb resi na chelloedd"
+
+#: 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 "Nid oes modd mewnosod y tabl am ei fod yn rhy fawr"
 
 #: dochdl.src
 msgctxt ""
diff --git a/source/cy/sw/uiconfig/swriter/ui.po b/source/cy/sw/uiconfig/swriter/ui.po
index 42f98998638..906c5fe46fe 100644
--- a/source/cy/sw/uiconfig/swriter/ui.po
+++ b/source/cy/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-08-11 18:28+0000\n"
-"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
+"POT-Creation-Date: 2015-09-01 20:20+0200\n"
+"PO-Revision-Date: 2015-08-27 08:13+0000\n"
+"Last-Translator: system user <>\n"
 "Language-Team: none\n"
 "Language: cy\n"
 "MIME-Version: 1.0\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1439317693.000000\n"
+"X-POOTLE-MTIME: 1440663223.000000\n"
 
 #: abstractdialog.ui
 msgctxt ""
@@ -9753,15 +9753,6 @@ msgstr "_Mynegai:"
 #: optfonttabpage.ui
 msgctxt ""
 "optfonttabpage.ui\n"
-"doconly\n"
-"label\n"
-"string.text"
-msgid "C_urrent document only"
-msgstr "Y _ddogfen gyfredol yn unig"
-
-#: optfonttabpage.ui
-msgctxt ""
-"optfonttabpage.ui\n"
 "label1\n"
 "label\n"
 "string.text"
@@ -12682,6 +12673,42 @@ msgstr "Dim"
 #: sidebarwrap.ui
 msgctxt ""
 "sidebarwrap.ui\n"
+"buttonparallel\n"
+"tooltip_markup\n"
+"string.text"
+msgid "Parallel"
+msgstr "Paralel"
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"buttonparallel\n"
+"tooltip_text\n"
+"string.text"
+msgid "Parallel"
+msgstr "Paralel"
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"buttonoptimal\n"
+"tooltip_markup\n"
+"string.text"
+msgid "Optimal"
+msgstr "Optimaidd"
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
+"buttonoptimal\n"
+"tooltip_text\n"
+"string.text"
+msgid "Optimal"
+msgstr "Optimaidd"
+
+#: sidebarwrap.ui
+msgctxt ""
+"sidebarwrap.ui\n"
 "buttonbefore\n"
 "tooltip_markup\n"
 "string.text"
@@ -12718,56 +12745,184 @@ msgstr "Wedi"
 #: sidebarwrap.ui
 msgctxt ""
 "sidebarwrap.ui\n"
-"buttonparallel\n"
+"buttonthrough\n"
 "tooltip_markup\n"
 "string.text"
-msgid "Parallel"
-msgstr "Paralel"
+msgid "Through"
+msgstr "Drwy"
 
 #: sidebarwrap.ui
 msgctxt ""
 "sidebarwrap.ui\n"
-"buttonparallel\n"
+"buttonthrough\n"
 "tooltip_text\n"
 "string.text"
-msgid "Parallel"
-msgstr "Paralel"
+msgid "Through"
+msgstr "Drwy"
 
 #: 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 "Drwy"
+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 "Drwy"
+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 "Optimaidd"
+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 "Optimaidd"
+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 "Bylchu:"
+
+#: 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 "Dim"
+
+#: 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 ""
@@ -14395,8 +14550,8 @@ msgctxt ""
 "TocDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Index/Table"
-msgstr "Mewnosod Mynegai/Tabl"
+msgid "Insert Index or Table of Contents"
+msgstr "Mewnosod Mynegai neu Dabl Cynnwys"
 
 #: tocdialog.ui
 msgctxt ""
@@ -14413,8 +14568,8 @@ msgctxt ""
 "index\n"
 "label\n"
 "string.text"
-msgid "Index/Table"
-msgstr "Mynegai/Tabl"
+msgid "Index or Table of Contents"
+msgstr "Mynegai neu Dabl Cynnwys"
 
 #: tocdialog.ui
 msgctxt ""
@@ -14989,8 +15144,8 @@ msgctxt ""
 "label1\n"
 "label\n"
 "string.text"
-msgid "Create Index/Table"
-msgstr "Creu Mynegai/Tabl"
+msgid "Create Index or Table of Contents"
+msgstr "Creu Mynegai neu Dabl Cynnwys"
 
 #: tocindexpage.ui
 msgctxt ""
@@ -15526,33 +15681,6 @@ msgstr "Dangos"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"hscrollbar\n"
-"label\n"
-"string.text"
-msgid "H_orizontal scrollbar"
-msgstr "Bar sgrolio _llorweddol"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
-"vscrollbar\n"
-"label\n"
-"string.text"
-msgid "_Vertical scrollbar"
-msgstr "Bar sgrolio _fertigol"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
-"ruler\n"
-"label\n"
-"string.text"
-msgid "R_uler"
-msgstr "_Mesurydd"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
 "smoothscroll\n"
 "label\n"
 "string.text"
@@ -15562,15 +15690,6 @@ msgstr "Sgrolio _llyfn"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"hruler\n"
-"label\n"
-"string.text"
-msgid "Hori_zontal ruler"
-msgstr "Mesurydd ll_orweddol"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
 "vruler\n"
 "label\n"
 "string.text"
@@ -15589,6 +15708,15 @@ msgstr "Alinio i'r dde"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
+"hruler\n"
+"label\n"
+"string.text"
+msgid "Hori_zontal ruler"
+msgstr "Mesurydd ll_orweddol"
+
+#: viewoptionspage.ui
+msgctxt ""
+"viewoptionspage.ui\n"
 "label3\n"
 "label\n"
 "string.text"