Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

11 files changed, 64 insertions, 33 deletions

diff --git a/source/ve/sw/source/core/undo.po b/source/ve/sw/source/core/undo.po
index b7285078466..e0bdc767609 100644
--- a/source/ve/sw/source/core/undo.po
+++ b/source/ve/sw/source/core/undo.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/core/undo
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:41+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029715.0\n"
 
 #: undo.src
@@ -57,6 +57,7 @@ msgid "New Paragraph"
 msgstr "Pharagirafu Ntswa"
 
 #: undo.src
+#, fuzzy
 msgctxt ""
 "undo.src\n"
 "STR_MOVE_UNDO\n"
diff --git a/source/ve/sw/source/core/unocore.po b/source/ve/sw/source/core/unocore.po
index 673f2fda433..9ef72218e41 100644
--- a/source/ve/sw/source/core/unocore.po
+++ b/source/ve/sw/source/core/unocore.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/core/unocore
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 04:26+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: unocore.src
 msgctxt ""
@@ -32,6 +32,7 @@ msgid "Column %COLUMNLETTER"
 msgstr ""
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_CHARACTER\n"
@@ -56,6 +57,7 @@ msgstr ""
 "Tshiteṅwa"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_PARAGRAPH\n"
@@ -82,6 +84,7 @@ msgid "Frame"
 msgstr "Fureme"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_PAGE\n"
@@ -102,6 +105,7 @@ msgstr ""
 "Masiaṱari"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_NUMBERING\n"
diff --git a/source/ve/sw/source/ui/app.po b/source/ve/sw/source/ui/app.po
index ab5c44e2d24..215ee4dac8c 100644
--- a/source/ve/sw/source/ui/app.po
+++ b/source/ve/sw/source/ui/app.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/app
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:41+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029717.0\n"
 
 #: app.src
@@ -1479,6 +1479,7 @@ msgid "Subscript"
 msgstr "Sabusikiriputi"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_TEXT_ATTR\n"
@@ -1496,6 +1497,7 @@ msgstr ""
 "Tshita~ela"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_TEXT_ATTR.MN_FORMAT_ALGN\n"
@@ -1664,6 +1666,7 @@ msgid "Continue previous numbering"
 msgstr ""
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "_NUMBERING_RELATED_MENU\n"
diff --git a/source/ve/sw/source/ui/config.po b/source/ve/sw/source/ui/config.po
index 602f0279020..6baa504987f 100644
--- a/source/ve/sw/source/ui/config.po
+++ b/source/ve/sw/source/ui/config.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/config
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-02-22 06:36+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: mailconfigpage.src
 msgctxt ""
@@ -521,6 +521,7 @@ msgid "Basic fonts (%1)"
 msgstr "Miṅwalo yo ḓoweleaho (%1)"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "TP_STD_FONT\n"
@@ -544,6 +545,7 @@ msgstr ""
 "Muṅwalo"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "TP_STD_FONT\n"
@@ -1068,6 +1070,7 @@ msgid "%PRODUCTNAME %s"
 msgstr "Mushumo wa %PRODUCTNAME"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1146,6 +1149,7 @@ msgid "Print text in blac~k"
 msgstr "Phirinthelani kha faela"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1185,6 +1189,7 @@ msgid "~Use only paper tray from printer preferences"
 msgstr ""
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1294,6 +1299,7 @@ msgid "Include"
 msgstr "Katelani"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1343,6 +1349,7 @@ msgid "~All pages"
 msgstr ""
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1364,6 +1371,7 @@ msgstr ""
 "Masiaṱari"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1922,6 +1930,7 @@ msgid "Char"
 msgstr "Tshati"
 
 #: optload.src
+#, fuzzy
 msgctxt ""
 "optload.src\n"
 "STR_ARR_METRIC\n"
diff --git a/source/ve/sw/source/ui/dbui.po b/source/ve/sw/source/ui/dbui.po
index b4ceacfe540..71109b37090 100644
--- a/source/ve/sw/source/ui/dbui.po
+++ b/source/ve/sw/source/ui/dbui.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/dbui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-12-26 11:45+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1356522315.0\n"
 
 #: addresslistdialog.src
@@ -2313,6 +2313,7 @@ msgid "Sen~d as"
 msgstr "Rumel~ani sa"
 
 #: mmoutputpage.src
+#, fuzzy
 msgctxt ""
 "mmoutputpage.src\n"
 "DLG_MM_OUTPUT_PAGE\n"
diff --git a/source/ve/sw/source/ui/docvw.po b/source/ve/sw/source/ui/docvw.po
index 7cafb809d28..88eafaea077 100644
--- a/source/ve/sw/source/ui/docvw.po
+++ b/source/ve/sw/source/ui/docvw.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/docvw
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-05-10 07:55+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: access.src
 msgctxt ""
@@ -128,6 +128,7 @@ msgid "Page: $(ARG1)"
 msgstr "Siatari: $(ARG1)"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_ANNOTATION_AUTHOR_NAME\n"
@@ -152,6 +153,7 @@ msgstr ""
 "Munwali"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_ANNOTATION_DATE_NAME\n"
diff --git a/source/ve/sw/source/ui/envelp.po b/source/ve/sw/source/ui/envelp.po
index 5ed5d9dd22f..dd55f909d78 100644
--- a/source/ve/sw/source/ui/envelp.po
+++ b/source/ve/sw/source/ui/envelp.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/envelp
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:26+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: envelp.src
 msgctxt ""
@@ -1236,6 +1236,7 @@ msgid "Field"
 msgstr "budo"
 
 #: mailmrge.src
+#, fuzzy
 msgctxt ""
 "mailmrge.src\n"
 "DLG_MAILMERGE\n"
diff --git a/source/ve/sw/source/ui/fldui.po b/source/ve/sw/source/ui/fldui.po
index 5ed75af5e27..73366070dfb 100644
--- a/source/ve/sw/source/ui/fldui.po
+++ b/source/ve/sw/source/ui/fldui.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/fldui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:41+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029719.0\n"
 
 #: flddb.src
@@ -481,6 +481,7 @@ msgid "Endnotes"
 msgstr "Endenoutsi"
 
 #: fldref.src
+#, fuzzy
 msgctxt ""
 "fldref.src\n"
 "TP_FLD_REF\n"
@@ -1455,6 +1456,7 @@ msgid "Numbering"
 msgstr "U nombora"
 
 #: fldui.src
+#, fuzzy
 msgctxt ""
 "fldui.src\n"
 "FMT_REF_NUMBER\n"
diff --git a/source/ve/sw/source/ui/index.po b/source/ve/sw/source/ui/index.po
index e1ce7e35060..cc3de3a63f3 100644
--- a/source/ve/sw/source/ui/index.po
+++ b/source/ve/sw/source/ui/index.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/index
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-01-05 15:12+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: cnttab.src
 msgctxt ""
@@ -986,6 +986,7 @@ msgid "Format"
 msgstr "~Fomethe"
 
 #: cnttab.src
+#, fuzzy
 msgctxt ""
 "cnttab.src\n"
 "TP_TOX_ENTRY.LB_ENTRY_NO\n"
@@ -1251,6 +1252,7 @@ msgid "Assignment"
 msgstr "Mushumo"
 
 #: cnttab.src
+#, fuzzy
 msgctxt ""
 "cnttab.src\n"
 "DLG_ADD_IDX_STYLES\n"
@@ -1276,6 +1278,7 @@ msgstr ""
 "Tshamonde"
 
 #: cnttab.src
+#, fuzzy
 msgctxt ""
 "cnttab.src\n"
 "DLG_ADD_IDX_STYLES\n"
diff --git a/source/ve/sw/source/ui/lingu.po b/source/ve/sw/source/ui/lingu.po
index c204d36d6a3..44919a2483f 100644
--- a/source/ve/sw/source/ui/lingu.po
+++ b/source/ve/sw/source/ui/lingu.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/lingu
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-06-13 11:48+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: olmenu.src
 msgctxt ""
@@ -127,6 +127,7 @@ msgid "Reset to Default Language"
 msgstr ""
 
 #: olmenu.src
+#, fuzzy
 msgctxt ""
 "olmenu.src\n"
 "STR_LANGSTATUS_MORE\n"
diff --git a/source/ve/sw/source/ui/utlui.po b/source/ve/sw/source/ui/utlui.po
index 85795f5cccc..791cd809651 100644
--- a/source/ve/sw/source/ui/utlui.po
+++ b/source/ve/sw/source/ui/utlui.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/utlui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:42+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029722.0\n"
 
 #: attrdesc.src
@@ -952,6 +952,7 @@ msgid "Keywords"
 msgstr "Khiyiwede"
 
 #: initui.src
+#, fuzzy
 msgctxt ""
 "initui.src\n"
 "RID_SW_SHELLRES\n"
@@ -2060,6 +2061,7 @@ msgid "Endnote Characters"
 msgstr "Meledere a Endenoti"
 
 #: poolfmt.src
+#, fuzzy
 msgctxt ""
 "poolfmt.src\n"
 "STR_POOLPAGE_LANDSCAPE\n"
@@ -3841,6 +3843,7 @@ msgid "Draw objects"
 msgstr "Ola zwishumiwa"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_POSTIT\n"
@@ -4005,6 +4008,7 @@ msgid "Index"
 msgstr "~Indekisi"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_SINGLE_POSTIT\n"