update translations for master

and force-fix errors using pocheck

Change-Id: I5e201f8d1c7746b1612ff10f592d611f402dc72c

3 files changed, 269 insertions, 81 deletions

diff --git a/source/vi/sw/source/ui/app.po b/source/vi/sw/source/ui/app.po
index beb1b1fcb72..b83303d636c 100644
--- a/source/vi/sw/source/ui/app.po
+++ b/source/vi/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-14 06:31+0000\n"
+"POT-Creation-Date: 2015-08-25 12:34+0200\n"
+"PO-Revision-Date: 2015-06-26 04:14+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: vi\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: 1431585097.000000\n"
+"X-POOTLE-MTIME: 1435292070.000000\n"
 
 #: app.src
 msgctxt ""
@@ -1142,12 +1142,13 @@ msgid "Password-protected files cannot be opened."
 msgstr "Không thể mở các tập tin được bảo vệ bằng mật khẩu."
 
 #: 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 "Đây không phải là tập tin dạng WinWord6."
 
 #: error.src
@@ -1178,12 +1179,13 @@ msgid "File has been written in a newer version."
 msgstr "Tập tin đã được lưu trong phiên bản mới hơn."
 
 #: 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 "Không phải là tập tin dạng WinWord97."
 
 #: error.src
@@ -1534,34 +1536,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 "~Cập nhật mục lục/chỉ mục"
+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 "~Sửa mục lục/chỉ mục"
+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 "Xóa mục lục/chỉ mục"
+msgid "Delete Index or Table of Contents"
+msgstr ""
 
 #: mn.src
 msgctxt ""
@@ -2467,3 +2466,48 @@ msgctxt ""
 "menuitem.text"
 msgid "Delete Page Break"
 msgstr "Xóa ~phân trang"
+
+#, fuzzy
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_UPDATE_CUR_TOX\n"
+"menuitem.text"
+msgid "~Update Index or Table"
+msgstr "~Cập nhật mục lục/chỉ mục"
+
+#, fuzzy
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_EDIT_CURRENT_TOX\n"
+"menuitem.text"
+msgid "~Edit Index or Table"
+msgstr "~Sửa mục lục/chỉ mục"
+
+#, fuzzy
+msgctxt ""
+"mn.src\n"
+"BASE_TEXT_POPUPMENU_NOWEB\n"
+"FN_REMOVE_CUR_TOX\n"
+"menuitem.text"
+msgid "Delete Index or Table"
+msgstr "Xóa mục lục/chỉ mục"
+
+#: 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 "Đây không phải là tập tin dạng 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 "Không phải là tập tin dạng WinWord97."
diff --git a/source/vi/sw/source/ui/dochdl.po b/source/vi/sw/source/ui/dochdl.po
index 871dcb9f22b..bc66c827a0b 100644
--- a/source/vi/sw/source/ui/dochdl.po
+++ b/source/vi/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-14 06:32+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 "Không thể chèn một bảng vào bảng khác. Tuy nhiên, bạn có khả năng dán dữ liệu vào tài liệu khi con trỏ không nằm trong bảng."
+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 "Liên kết 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 "Không thể chèn một bảng vào bảng khác. Tuy nhiên, bạn có khả năng dán dữ liệu vào tài liệu khi con trỏ không nằm trong bảng."
diff --git a/source/vi/sw/uiconfig/swriter/ui.po b/source/vi/sw/uiconfig/swriter/ui.po
index 88d47520ede..629b3c16373 100644
--- a/source/vi/sw/uiconfig/swriter/ui.po
+++ b/source/vi/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-14 06:33+0000\n"
+"POT-Creation-Date: 2015-09-01 20:20+0200\n"
+"PO-Revision-Date: 2015-08-06 23:25+0000\n"
 "Last-Translator: system user <>\n"
 "Language-Team: none\n"
 "Language: vi\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: 1431585229.000000\n"
+"X-POOTLE-MTIME: 1438903545.000000\n"
 
 #: abstractdialog.ui
 msgctxt ""
@@ -9311,13 +9311,14 @@ msgid "R_estart at this paragraph"
 msgstr "Bắt đầu lại ở đoạn _văn này"
 
 #: numparapage.ui
+#, fuzzy
 msgctxt ""
 "numparapage.ui\n"
 "checkCB_NUMBER_NEW_START\n"
 "label\n"
 "string.text"
 msgid "S_tart with:"
-msgstr ""
+msgstr "Bắt đầu ở"
 
 #: numparapage.ui
 msgctxt ""
@@ -9898,15 +9899,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"
@@ -12863,6 +12855,42 @@ msgstr "Không"
 #: 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"
@@ -12899,55 +12927,183 @@ msgstr "Sau"
 #: 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 "Giãn cách"
+
+#: 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 "Không"
+
+#: 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
@@ -14590,7 +14746,7 @@ msgctxt ""
 "TocDialog\n"
 "title\n"
 "string.text"
-msgid "Insert Index/Table"
+msgid "Insert Index or Table of Contents"
 msgstr ""
 
 #: tocdialog.ui
@@ -14608,7 +14764,7 @@ msgctxt ""
 "index\n"
 "label\n"
 "string.text"
-msgid "Index/Table"
+msgid "Index or Table of Contents"
 msgstr ""
 
 #: tocdialog.ui
@@ -15194,7 +15350,7 @@ msgctxt ""
 "label1\n"
 "label\n"
 "string.text"
-msgid "Create Index/Table"
+msgid "Create Index or Table of Contents"
 msgstr ""
 
 #: tocindexpage.ui
@@ -15742,33 +15898,6 @@ msgstr "Hiển thị"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"hscrollbar\n"
-"label\n"
-"string.text"
-msgid "H_orizontal scrollbar"
-msgstr "Th_anh cuộn nằm ngang"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
-"vscrollbar\n"
-"label\n"
-"string.text"
-msgid "_Vertical scrollbar"
-msgstr "Thanh c_uộn nằm dọc"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
-"ruler\n"
-"label\n"
-"string.text"
-msgid "R_uler"
-msgstr "T_hước"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
 "smoothscroll\n"
 "label\n"
 "string.text"
@@ -15778,15 +15907,6 @@ msgstr "Cuộn _mịn"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
-"hruler\n"
-"label\n"
-"string.text"
-msgid "Hori_zontal ruler"
-msgstr "Thước nằm n_gang"
-
-#: viewoptionspage.ui
-msgctxt ""
-"viewoptionspage.ui\n"
 "vruler\n"
 "label\n"
 "string.text"
@@ -15805,6 +15925,15 @@ msgstr "Canh lề phải"
 #: viewoptionspage.ui
 msgctxt ""
 "viewoptionspage.ui\n"
+"hruler\n"
+"label\n"
+"string.text"
+msgid "Hori_zontal ruler"
+msgstr "Thước nằm n_gang"
+
+#: viewoptionspage.ui
+msgctxt ""
+"viewoptionspage.ui\n"
 "label3\n"
 "label\n"
 "string.text"