Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

15 files changed, 62 insertions, 45 deletions

diff --git a/source/vi/helpcontent2/source/text/sbasic/shared.po b/source/vi/helpcontent2/source/text/sbasic/shared.po
index afddf756860..13ab591db26 100644
--- a/source/vi/helpcontent2/source/text/sbasic/shared.po
+++ b/source/vi/helpcontent2/source/text/sbasic/shared.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/sbasic/shared
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-05-03 12:01+0200\n"
 "Last-Translator: vuhung <vuhung16plus@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01170101.xhp
 msgctxt ""
diff --git a/source/vi/helpcontent2/source/text/scalc/01.po b/source/vi/helpcontent2/source/text/scalc/01.po
index 604e298f940..fadeed86ed0 100644
--- a/source/vi/helpcontent2/source/text/scalc/01.po
+++ b/source/vi/helpcontent2/source/text/scalc/01.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/scalc/01
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-07-04 18:58+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 04090000.xhp
 msgctxt ""
diff --git a/source/vi/helpcontent2/source/text/shared.po b/source/vi/helpcontent2/source/text/shared.po
index 17b300c9e24..c8c989b846b 100644
--- a/source/vi/helpcontent2/source/text/shared.po
+++ b/source/vi/helpcontent2/source/text/shared.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-05 23:28+0200\n"
 "Last-Translator: vuhung <vuhung16plus@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: main0212.xhp
 msgctxt ""
diff --git a/source/vi/helpcontent2/source/text/shared/01.po b/source/vi/helpcontent2/source/text/shared/01.po
index 8e919289ff9..c699f47a689 100644
--- a/source/vi/helpcontent2/source/text/shared/01.po
+++ b/source/vi/helpcontent2/source/text/shared/01.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared/01
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 15:56+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: extensionupdate.xhp
 msgctxt ""
diff --git a/source/vi/helpcontent2/source/text/shared/guide.po b/source/vi/helpcontent2/source/text/shared/guide.po
index 98b4e01a4a8..0d76cfe67b2 100644
--- a/source/vi/helpcontent2/source/text/shared/guide.po
+++ b/source/vi/helpcontent2/source/text/shared/guide.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared/guide
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-11-01 00:51+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: pageformat_max.xhp
 msgctxt ""
diff --git a/source/vi/helpcontent2/source/text/shared/optionen.po b/source/vi/helpcontent2/source/text/shared/optionen.po
index f3e9cc6f659..f71234f5944 100644
--- a/source/vi/helpcontent2/source/text/shared/optionen.po
+++ b/source/vi/helpcontent2/source/text/shared/optionen.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/shared/optionen
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-07-04 18:59+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01060500.xhp
 msgctxt ""
diff --git a/source/vi/helpcontent2/source/text/smath/00.po b/source/vi/helpcontent2/source/text/smath/00.po
index 386a7de5ab4..b66f1258f6b 100644
--- a/source/vi/helpcontent2/source/text/smath/00.po
+++ b/source/vi/helpcontent2/source/text/smath/00.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/smath/00
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-05 23:30+0200\n"
 "Last-Translator: vuhung <vuhung16plus@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 00000004.xhp
 msgctxt ""
diff --git a/source/vi/helpcontent2/source/text/smath/01.po b/source/vi/helpcontent2/source/text/smath/01.po
index 6ff24885ef5..cd05f0e51ec 100644
--- a/source/vi/helpcontent2/source/text/smath/01.po
+++ b/source/vi/helpcontent2/source/text/smath/01.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/smath/01
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-02-21 03:16+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 03090400.xhp
 msgctxt ""
diff --git a/source/vi/helpcontent2/source/text/swriter/01.po b/source/vi/helpcontent2/source/text/swriter/01.po
index 7a362980d13..4213b6e5a62 100644
--- a/source/vi/helpcontent2/source/text/swriter/01.po
+++ b/source/vi/helpcontent2/source/text/swriter/01.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/swriter/01
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-01-11 18:34+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 04090000.xhp
 msgctxt ""
diff --git a/source/vi/helpcontent2/source/text/swriter/04.po b/source/vi/helpcontent2/source/text/swriter/04.po
index 6f6e4337d53..a10d1ff5ca9 100644
--- a/source/vi/helpcontent2/source/text/swriter/04.po
+++ b/source/vi/helpcontent2/source/text/swriter/04.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/swriter/04
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-05 23:31+0200\n"
 "Last-Translator: vuhung <vuhung16plus@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: 01020000.xhp
 msgctxt ""
diff --git a/source/vi/helpcontent2/source/text/swriter/guide.po b/source/vi/helpcontent2/source/text/swriter/guide.po
index 2132d33d047..6c9d2c9f19e 100644
--- a/source/vi/helpcontent2/source/text/swriter/guide.po
+++ b/source/vi/helpcontent2/source/text/swriter/guide.po
@@ -1,4 +1,4 @@
-#. extracted from helpcontent2/source/text/swriter/guide
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-06-13 03:19+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: hyperlinks.xhp
 msgctxt ""
diff --git a/source/vi/reportdesign/source/ui/dlg.po b/source/vi/reportdesign/source/ui/dlg.po
index a5cdf0535bb..babc8fea1a8 100644
--- a/source/vi/reportdesign/source/ui/dlg.po
+++ b/source/vi/reportdesign/source/ui/dlg.po
@@ -1,4 +1,4 @@
-#. extracted from reportdesign/source/ui/dlg
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 04:31+0200\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: CondFormat.src
 msgctxt ""
@@ -1016,6 +1016,7 @@ msgid "Character Settings"
 msgstr "Thiết lập Ký tự"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_LINE.1\n"
@@ -1066,6 +1067,7 @@ msgid "Return"
 msgstr "Lùi"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_LINE\n"
@@ -1089,6 +1091,7 @@ msgstr ""
 "Đường"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_LINE\n"
diff --git a/source/vi/sc/source/ui/src.po b/source/vi/sc/source/ui/src.po
index 127d922d5f4..5020209978f 100644
--- a/source/vi/sc/source/ui/src.po
+++ b/source/vi/sc/source/ui/src.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/ui/src
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-02-17 21:30+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361136658.0\n"
 
 #: autofmt.src
@@ -572,6 +572,7 @@ msgid "between"
 msgstr "giữa"
 
 #: condformatdlg.src
+#, fuzzy
 msgctxt ""
 "condformatdlg.src\n"
 "RID_COND_ENTRY.LB_CELLIS_TYPE\n"
@@ -6962,6 +6963,7 @@ msgid "between"
 msgstr "giữa"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -7452,6 +7454,7 @@ msgid "Cu~t"
 msgstr "Cắ~t"
 
 #: hdrcont.src
+#, fuzzy
 msgctxt ""
 "hdrcont.src\n"
 "PART2\n"
@@ -7896,6 +7899,7 @@ msgid "Paste Special"
 msgstr "Dán đặc biệt"
 
 #: miscdlgs.src
+#, fuzzy
 msgctxt ""
 "miscdlgs.src\n"
 "RID_SCDLG_MOVETAB\n"
@@ -7922,6 +7926,7 @@ msgid "~Move"
 msgstr "Chuyển"
 
 #: miscdlgs.src
+#, fuzzy
 msgctxt ""
 "miscdlgs.src\n"
 "RID_SCDLG_MOVETAB\n"
@@ -7945,6 +7950,7 @@ msgstr ""
 "~Chép"
 
 #: miscdlgs.src
+#, fuzzy
 msgctxt ""
 "miscdlgs.src\n"
 "RID_SCDLG_MOVETAB\n"
@@ -8766,6 +8772,7 @@ msgid "~Delete"
 msgstr "~Xoá"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "RID_SCPAGE_USERLISTS\n"
@@ -9425,6 +9432,7 @@ msgid "~Suppress output of empty pages"
 msgstr "Không in trang ~trắng"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "RID_SCPAGE_PRINT\n"
@@ -9686,6 +9694,7 @@ msgid "Cu~t"
 msgstr "Cắ~t"
 
 #: popup.src
+#, fuzzy
 msgctxt ""
 "popup.src\n"
 "RID_POPUP_CELLS\n"
@@ -25174,6 +25183,7 @@ msgid "(read-only)"
 msgstr " (chỉ đọc)"
 
 #: scstring.src
+#, fuzzy
 msgctxt ""
 "scstring.src\n"
 "STR_ACC_DOC_PREVIEW_SUFFIX\n"
diff --git a/source/vi/sd/source/ui/view.po b/source/vi/sd/source/ui/view.po
index cfa7263197b..a7881d00b80 100644
--- a/source/vi/sd/source/ui/view.po
+++ b/source/vi/sd/source/ui/view.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/view
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 04:31+0200\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: DocumentRenderer.src
 msgctxt ""
@@ -430,6 +430,7 @@ msgid "~Use only paper tray from printer preferences"
 msgstr "Chỉ ~dùng khay giấy từ máy in đã chọn"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -483,6 +484,7 @@ msgid "~All pages"
 msgstr "~Mọi trang"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE\n"
diff --git a/source/vi/svl/source/misc.po b/source/vi/svl/source/misc.po
index b38289142f3..d76a6f85f62 100644
--- a/source/vi/svl/source/misc.po
+++ b/source/vi/svl/source/misc.po
@@ -1,4 +1,4 @@
-#. extracted from svl/source/misc
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-05-07 13:14+0200\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: mediatyp.src
 msgctxt ""
@@ -184,6 +184,7 @@ msgid "Graphics"
 msgstr "Đồ họa"
 
 #: mediatyp.src
+#, fuzzy
 msgctxt ""
 "mediatyp.src\n"
 "STR_SVT_MIMETYPE_IMAGE_BMP\n"
@@ -318,6 +319,7 @@ msgid "Folder"
 msgstr "Thư mục"
 
 #: mediatyp.src
+#, fuzzy
 msgctxt ""
 "mediatyp.src\n"
 "STR_SVT_MIMETYPE_APP_GAL\n"