update translations for master

and force-fix errors using pocheck

Change-Id: I5e201f8d1c7746b1612ff10f592d611f402dc72c

3 files changed, 219 insertions, 82 deletions

diff --git a/source/fa/sw/source/ui/app.po b/source/fa/sw/source/ui/app.po
index 99d6277cdfe..cdf7a9fa622 100644
--- a/source/fa/sw/source/ui/app.po
+++ b/source/fa/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-12 11:42+0000\n"
+"POT-Creation-Date: 2015-08-25 12:34+0200\n"
+"PO-Revision-Date: 2015-08-25 22:15+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fa\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1431430968.000000\n"
+"X-POOTLE-MTIME: 1440540958.000000\n"
 
 #: app.src
 msgctxt ""
@@ -1142,12 +1142,13 @@ msgid "Password-protected files cannot be opened."
 msgstr "نمی‌توان پروندهٔ محافظت شده با گذرواژه را باز کرد."
 
 #: 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 "این یک پرونده ورد 6 نیست."
 
 #: error.src
@@ -1178,12 +1179,13 @@ msgid "File has been written in a newer version."
 msgstr "پرونده در نسخه‌ی جدیدتری نوشته شده است"
 
 #: 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 "این پرونده متعلق به WinWord97 نیست"
 
 #: error.src
@@ -1536,34 +1538,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 "~به‌هنگام‌سازی نمایه/جدول"
+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 "~ویرایش نمایه/جدول"
+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 "حذف نمایه/جدول"
+msgid "Delete Index or Table of Contents"
+msgstr ""
 
 #: mn.src
 msgctxt ""
diff --git a/source/fa/sw/source/ui/dochdl.po b/source/fa/sw/source/ui/dochdl.po
index af9f6288fb1..f473e67b634 100644
--- a/source/fa/sw/source/ui/dochdl.po
+++ b/source/fa/sw/source/ui/dochdl.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-04-22 23:40+0200\n"
-"PO-Revision-Date: 2015-05-12 11:43+0000\n"
+"POT-Creation-Date: 2015-08-25 12:34+0200\n"
+"PO-Revision-Date: 2015-08-25 22:16+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fa\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1431431019.000000\n"
+"X-POOTLE-MTIME: 1440540972.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 "یک جدول نمی‌تواند داخل سایر جدول درج شود. با این حال، وقتی که مکان‌نما در یک جدول نیست، شما می‌توانید داده را داخل سند بچسبانید."
+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 ""
diff --git a/source/fa/sw/uiconfig/swriter/ui.po b/source/fa/sw/uiconfig/swriter/ui.po
index eee16af058e..d682bcfeb1e 100644
--- a/source/fa/sw/uiconfig/swriter/ui.po
+++ b/source/fa/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 11:44+0000\n"
+"POT-Creation-Date: 2015-09-01 20:20+0200\n"
+"PO-Revision-Date: 2015-08-25 22:17+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: none\n"
 "Language: fa\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.7\n"
 "X-Accelerator-Marker: ~\n"
-"X-POOTLE-MTIME: 1431431087.000000\n"
+"X-POOTLE-MTIME: 1440541028.000000\n"
 
 #: abstractdialog.ui
 msgctxt ""
@@ -3478,13 +3478,14 @@ msgid "_Width"
 msgstr "عرض"
 
 #: envformatpage.ui
+#, fuzzy
 msgctxt ""
 "envformatpage.ui\n"
 "label14\n"
 "label\n"
 "string.text"
 msgid "_Height"
-msgstr ""
+msgstr "راست"
 
 #: envformatpage.ui
 msgctxt ""
@@ -5689,13 +5690,14 @@ msgid "H_eight (at least)"
 msgstr ""
 
 #: frmtypepage.ui
+#, fuzzy
 msgctxt ""
 "frmtypepage.ui\n"
 "heightft\n"
 "label\n"
 "string.text"
 msgid "H_eight"
-msgstr ""
+msgstr "راست"
 
 #: frmtypepage.ui
 msgctxt ""
@@ -9987,15 +9989,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"
@@ -12420,13 +12413,14 @@ msgid "_Fit to size"
 msgstr ""
 
 #: rowheight.ui
+#, fuzzy
 msgctxt ""
 "rowheight.ui\n"
 "label1\n"
 "label\n"
 "string.text"
 msgid "Height"
-msgstr ""
+msgstr "راست"
 
 #: saveashtmldialog.ui
 msgctxt ""
@@ -12971,6 +12965,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"
@@ -13013,55 +13043,182 @@ msgstr "بعد"
 #: 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 "فاصله‌گذاری"
+
+#: 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
@@ -14749,7 +14906,7 @@ msgctxt ""
 "TocDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Index/Table"
+msgid "Insert Index or Table of Contents"
 msgstr ""
 
 #: tocdialog.ui
@@ -14767,7 +14924,7 @@ msgctxt ""
 "index\n"
 "label\n"
 "string.text"
-msgid "Index/Table"
+msgid "Index or Table of Contents"
 msgstr ""
 
 #: tocdialog.ui
@@ -15366,7 +15523,7 @@ msgctxt ""
 "label1\n"
 "label\n"
 "string.text"
-msgid "Create Index/Table"
+msgid "Create Index or Table of Contents"
 msgstr ""
 
 #: tocindexpage.ui
@@ -15912,33 +16069,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"
@@ -15948,28 +16078,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