Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

6 files changed, 38 insertions, 18 deletions

diff --git a/source/ts/svx/source/dialog.po b/source/ts/svx/source/dialog.po
index 904aa545b55..e2728fd71f7 100644
--- a/source/ts/svx/source/dialog.po
+++ b/source/ts/svx/source/dialog.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/dialog
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:35+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029312.0\n"
 
 #: bmpmask.src
@@ -70,6 +70,7 @@ msgid "~Replace"
 msgstr "(Siva)"
 
 #: bmpmask.src
+#, fuzzy
 msgctxt ""
 "bmpmask.src\n"
 "RID_SVXDLG_BMPMASK.TBX_PIPETTE\n"
@@ -272,6 +273,7 @@ msgid "Redo "
 msgstr "Hundzisela emahlweni "
 
 #: contdlg.src
+#, fuzzy
 msgctxt ""
 "contdlg.src\n"
 "RID_SVXDLG_CONTOUR.TBX1\n"
@@ -541,6 +543,7 @@ msgid ""
 msgstr ""
 
 #: docrecovery.src
+#, fuzzy
 msgctxt ""
 "docrecovery.src\n"
 "RID_SVXPAGE_DOCRECOVERY_RECOVER\n"
@@ -1703,6 +1706,7 @@ msgid "Resolution"
 msgstr "Ndlela ya xivu~mbeko eka xikirini"
 
 #: optgrid.src
+#, fuzzy
 msgctxt ""
 "optgrid.src\n"
 "RID_SVXPAGE_GRID\n"
@@ -1742,6 +1746,7 @@ msgid "Subdivision"
 msgstr "Ku avanyisa loku tsongo"
 
 #: optgrid.src
+#, fuzzy
 msgctxt ""
 "optgrid.src\n"
 "RID_SVXPAGE_GRID\n"
@@ -3078,6 +3083,7 @@ msgid "From the Middle, Violet"
 msgstr "Ku Suka Ehenhla Eximatsini"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT38\n"
@@ -3114,6 +3120,7 @@ msgid "Horizontal Green"
 msgstr "Nghena hi Vuandlalo"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT41\n"
@@ -3128,6 +3135,7 @@ msgstr ""
 "Layini ya Vuandlalo"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT42\n"
@@ -4087,6 +4095,7 @@ msgid "Files Found"
 msgstr "Fayili a yi kumekangi: "
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GALLERY_PREVIEW\n"
diff --git a/source/ts/svx/source/form.po b/source/ts/svx/source/form.po
index 144b239fae9..cb66691947f 100644
--- a/source/ts/svx/source/form.po
+++ b/source/ts/svx/source/form.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/form
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:35+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029313.0\n"
 
 #: datanavi.src
@@ -1427,6 +1427,7 @@ msgid "Table"
 msgstr "Tafula"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_TABWIN_PREFIX\n"
@@ -2006,6 +2007,7 @@ msgid "Count"
 msgstr "Hlayela"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_SQL_INTERNATIONAL\n"
@@ -2028,6 +2030,7 @@ msgid "Minimum"
 msgstr "Minimamu"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_SQL_INTERNATIONAL\n"
@@ -2247,6 +2250,7 @@ msgid " (read-only)"
 msgstr " (hlaya-ntsena)"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_STR_ALREADYEXISTOVERWRITE\n"
diff --git a/source/ts/svx/source/gallery2.po b/source/ts/svx/source/gallery2.po
index efe39731451..43b0324afdf 100644
--- a/source/ts/svx/source/gallery2.po
+++ b/source/ts/svx/source/gallery2.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/gallery2
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-12-26 11:38+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1356521924.0\n"
 
 #: gallery.src
@@ -1166,6 +1166,7 @@ msgid "Signs - danger"
 msgstr ""
 
 #: galtheme.src
+#, fuzzy
 msgctxt ""
 "galtheme.src\n"
 "RID_GALLERYSTR_THEME_OBJECTS\n"
diff --git a/source/ts/svx/source/src.po b/source/ts/svx/source/src.po
index bf2190d0e6a..b7c27e41358 100644
--- a/source/ts/svx/source/src.po
+++ b/source/ts/svx/source/src.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/src
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ 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: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: app.src
 msgctxt ""
@@ -257,6 +257,7 @@ msgid "Write Error"
 msgstr "Xihoxo xa ku tsala"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRHDL\n"
diff --git a/source/ts/svx/source/svdraw.po b/source/ts/svx/source/svdraw.po
index 574989b292d..c6014c5aa77 100644
--- a/source/ts/svx/source/svdraw.po
+++ b/source/ts/svx/source/svdraw.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/svdraw
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ 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: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: svdstr.src
 msgctxt ""
@@ -4847,6 +4847,7 @@ msgid "Delete column"
 msgstr "Sula kholomu"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_UNDO_ROW_DELETE\n"
@@ -4923,6 +4924,7 @@ msgid "Table"
 msgstr "Tafula"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNamePluralTable\n"
@@ -4943,6 +4945,7 @@ msgstr ""
 "Swibokisana"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNameSingulFONTWORK\n"
@@ -4957,6 +4960,7 @@ msgstr ""
 "Ntirho wa fonti"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNamePluralFONTWORK\n"
diff --git a/source/ts/svx/source/tbxctrls.po b/source/ts/svx/source/tbxctrls.po
index cd0795985e3..d3d17c3d8df 100644
--- a/source/ts/svx/source/tbxctrls.po
+++ b/source/ts/svx/source/tbxctrls.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/tbxctrls
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ 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: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: colrctrl.src
 msgctxt ""
@@ -715,6 +715,7 @@ msgid "More..."
 msgstr "Swin'wana..."
 
 #: tbcontrl.src
+#, fuzzy
 msgctxt ""
 "tbcontrl.src\n"
 "RID_SVXSTR_TEXTCOLOR\n"