Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

9 files changed, 49 insertions, 27 deletions

diff --git a/source/xh/sw/source/core/unocore.po b/source/xh/sw/source/core/unocore.po
index ddfba77fdc6..2110944a879 100644
--- a/source/xh/sw/source/core/unocore.po
+++ b/source/xh/sw/source/core/unocore.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/core/unocore
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 04:39+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: xh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: xh\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: unocore.src
 msgctxt ""
@@ -31,6 +31,7 @@ msgid "Column %COLUMNLETTER"
 msgstr ""
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_CHARACTER\n"
@@ -79,6 +80,7 @@ msgid "Pages"
 msgstr "Amakhasi"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_NUMBERING\n"
diff --git a/source/xh/sw/source/ui/app.po b/source/xh/sw/source/ui/app.po
index d48203bb397..97df72cfa38 100644
--- a/source/xh/sw/source/ui/app.po
+++ b/source/xh/sw/source/ui/app.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/app
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:44+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: xh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: xh\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029844.0\n"
 
 #: app.src
@@ -1487,6 +1487,7 @@ msgid "St~yle"
 msgstr "Isi~mbo"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_TEXT_ATTR.MN_FORMAT_ALGN\n"
@@ -1655,6 +1656,7 @@ msgid "Continue previous numbering"
 msgstr ""
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "_NUMBERING_RELATED_MENU\n"
diff --git a/source/xh/sw/source/ui/config.po b/source/xh/sw/source/ui/config.po
index d3c5eb0c720..eaaf24f91f3 100644
--- a/source/xh/sw/source/ui/config.po
+++ b/source/xh/sw/source/ui/config.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/config
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-02-22 06:43+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: xh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: xh\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: mailconfigpage.src
 msgctxt ""
@@ -520,6 +520,7 @@ msgid "Basic fonts (%1)"
 msgstr "Iifonti ezisisiseko (%1)"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "TP_STD_FONT\n"
@@ -1049,6 +1050,7 @@ msgid "%PRODUCTNAME %s"
 msgstr "Isiseko se-%PRODUCTNAME"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1109,6 +1111,7 @@ msgid "Form control~s"
 msgstr "Ulawulo lwekhesa"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1263,6 +1266,7 @@ msgid "Include"
 msgstr "Bandakanya"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1321,6 +1325,7 @@ msgid "Pa~ges"
 msgstr "Amakhasi"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -2014,6 +2019,7 @@ msgid "Background color"
 msgstr "Umbala ongasemva"
 
 #: redlopt.src
+#, fuzzy
 msgctxt ""
 "redlopt.src\n"
 "TP_REDLINE_OPT\n"
@@ -2060,6 +2066,7 @@ msgid "Attributes"
 msgstr "Iimpawu zoyelelwano"
 
 #: redlopt.src
+#, fuzzy
 msgctxt ""
 "redlopt.src\n"
 "TP_REDLINE_OPT\n"
@@ -2106,6 +2113,7 @@ msgid "Attributes"
 msgstr "Iimpawu zoyelelwano"
 
 #: redlopt.src
+#, fuzzy
 msgctxt ""
 "redlopt.src\n"
 "TP_REDLINE_OPT\n"
diff --git a/source/xh/sw/source/ui/dbui.po b/source/xh/sw/source/ui/dbui.po
index 8e6bcdfa581..86716acee38 100644
--- a/source/xh/sw/source/ui/dbui.po
+++ b/source/xh/sw/source/ui/dbui.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/dbui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-12-26 11:11+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: xh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: xh\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1356520273.0\n"
 
 #: addresslistdialog.src
@@ -2312,6 +2312,7 @@ msgid "Sen~d as"
 msgstr "Thu~mela njengoku"
 
 #: mmoutputpage.src
+#, fuzzy
 msgctxt ""
 "mmoutputpage.src\n"
 "DLG_MM_OUTPUT_PAGE\n"
diff --git a/source/xh/sw/source/ui/docvw.po b/source/xh/sw/source/ui/docvw.po
index b0277603d0e..480356312ac 100644
--- a/source/xh/sw/source/ui/docvw.po
+++ b/source/xh/sw/source/ui/docvw.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/docvw
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-05-10 08:00+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: xh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: xh\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: access.src
 msgctxt ""
@@ -167,6 +167,7 @@ msgid "Document preview"
 msgstr "Ukujonga uxwebhu"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_PREVIEW_DOC_SUFFIX\n"
diff --git a/source/xh/sw/source/ui/envelp.po b/source/xh/sw/source/ui/envelp.po
index b4312dd2c90..831c0c0eaee 100644
--- a/source/xh/sw/source/ui/envelp.po
+++ b/source/xh/sw/source/ui/envelp.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/envelp
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:25+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: xh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: xh\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: envelp.src
 msgctxt ""
@@ -1235,6 +1235,7 @@ msgid "Field"
 msgstr "Imimandla"
 
 #: mailmrge.src
+#, fuzzy
 msgctxt ""
 "mailmrge.src\n"
 "DLG_MAILMERGE\n"
diff --git a/source/xh/sw/source/ui/fldui.po b/source/xh/sw/source/ui/fldui.po
index 61f22932a00..ba2a406a916 100644
--- a/source/xh/sw/source/ui/fldui.po
+++ b/source/xh/sw/source/ui/fldui.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/fldui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:44+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: xh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: xh\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029847.0\n"
 
 #: flddb.src
@@ -480,6 +480,7 @@ msgid "Endnotes"
 msgstr "Amanqaku okuphetha"
 
 #: fldref.src
+#, fuzzy
 msgctxt ""
 "fldref.src\n"
 "TP_FLD_REF\n"
@@ -1454,6 +1455,7 @@ msgid "Numbering"
 msgstr "Ukufakwa kweenombolo"
 
 #: fldui.src
+#, fuzzy
 msgctxt ""
 "fldui.src\n"
 "FMT_REF_NUMBER\n"
diff --git a/source/xh/sw/source/ui/index.po b/source/xh/sw/source/ui/index.po
index 5469e1cc582..eb8e8bb057c 100644
--- a/source/xh/sw/source/ui/index.po
+++ b/source/xh/sw/source/ui/index.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/index
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-01-05 15:16+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: xh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: xh\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: cnttab.src
 msgctxt ""
@@ -985,6 +985,7 @@ msgid "Format"
 msgstr "Ulungiselelo"
 
 #: cnttab.src
+#, fuzzy
 msgctxt ""
 "cnttab.src\n"
 "TP_TOX_ENTRY.LB_ENTRY_NO\n"
diff --git a/source/xh/sw/source/ui/utlui.po b/source/xh/sw/source/ui/utlui.po
index c2d07a8f2bd..9b77eaeb1d2 100644
--- a/source/xh/sw/source/ui/utlui.po
+++ b/source/xh/sw/source/ui/utlui.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/utlui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:44+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: xh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: xh\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029849.0\n"
 
 #: attrdesc.src
@@ -951,6 +951,7 @@ msgid "Keywords"
 msgstr "Amagama asentloko"
 
 #: initui.src
+#, fuzzy
 msgctxt ""
 "initui.src\n"
 "RID_SW_SHELLRES\n"
@@ -2059,6 +2060,7 @@ msgid "Endnote Characters"
 msgstr "Imibhalo Enjengoonobumba Yengongoma Esezantsi Kwekhasi"
 
 #: poolfmt.src
+#, fuzzy
 msgctxt ""
 "poolfmt.src\n"
 "STR_POOLPAGE_LANDSCAPE\n"
@@ -3840,6 +3842,7 @@ msgid "Draw objects"
 msgstr "Zoba izinto"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_POSTIT\n"
@@ -4004,6 +4007,7 @@ msgid "Index"
 msgstr "~Isalathi"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_SINGLE_POSTIT\n"