Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

6 files changed, 48 insertions, 18 deletions

diff --git a/source/nr/svx/source/dialog.po b/source/nr/svx/source/dialog.po
index dc184284f03..73843882473 100644
--- a/source/nr/svx/source/dialog.po
+++ b/source/nr/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:01+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366027264.0\n"
 
 #: bmpmask.src
@@ -70,6 +70,7 @@ msgid "~Replace"
 msgstr "(Jamiselela)"
 
 #: bmpmask.src
+#, fuzzy
 msgctxt ""
 "bmpmask.src\n"
 "RID_SVXDLG_BMPMASK.TBX_PIPETTE\n"
@@ -272,6 +273,7 @@ msgid "Redo "
 msgstr "Yenza godu "
 
 #: 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 "Isiqunto"
 
 #: optgrid.src
+#, fuzzy
 msgctxt ""
 "optgrid.src\n"
 "RID_SVXPAGE_GRID\n"
@@ -1742,6 +1746,7 @@ msgid "Subdivision"
 msgstr "Ingcenye yesihlukanisi"
 
 #: optgrid.src
+#, fuzzy
 msgctxt ""
 "optgrid.src\n"
 "RID_SVXPAGE_GRID\n"
@@ -2100,6 +2105,7 @@ msgid "Pica"
 msgstr "Iphika"
 
 #: ruler.src
+#, fuzzy
 msgctxt ""
 "ruler.src\n"
 "RID_SVXMN_RULER\n"
@@ -2580,6 +2586,7 @@ msgid "Sun"
 msgstr "Ilanga"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_COLOR_CHART\n"
@@ -3090,6 +3097,7 @@ msgid "From the Middle, Violet"
 msgstr "Ukusuka ngehla ngesinceleni"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT38\n"
@@ -3126,6 +3134,7 @@ msgid "Horizontal Green"
 msgstr "Thabalalele ku"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT41\n"
@@ -3140,6 +3149,7 @@ msgstr ""
 "Umuda obuvundla"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT42\n"
@@ -3256,6 +3266,7 @@ msgid "Vertical Green"
 msgstr "Buvundla ngaphakathi"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT55\n"
@@ -3917,6 +3928,7 @@ msgid "Point"
 msgstr "~Iphuzu"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_FIELDUNIT_TABLE\n"
@@ -4109,6 +4121,7 @@ msgid "Files Found"
 msgstr "Ifayili ayitholakali: "
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GALLERY_PREVIEW\n"
diff --git a/source/nr/svx/source/form.po b/source/nr/svx/source/form.po
index 3727af47fd2..171feed41e7 100644
--- a/source/nr/svx/source/form.po
+++ b/source/nr/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:01+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366027265.0\n"
 
 #: datanavi.src
@@ -1418,6 +1418,7 @@ msgid "Form"
 msgstr "Iimbumbeko"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_TABWIN_PREFIX\n"
@@ -1447,6 +1448,7 @@ msgstr ""
 "Theyibula"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_TABWIN_PREFIX\n"
@@ -1466,6 +1468,7 @@ msgstr ""
 "Umbuzo"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_TABWIN_PREFIX\n"
@@ -2030,6 +2033,7 @@ msgid "Count"
 msgstr "Bala"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_SQL_INTERNATIONAL\n"
@@ -2043,6 +2047,7 @@ msgstr ""
 "Ubukhulu"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_SQL_INTERNATIONAL\n"
@@ -2056,6 +2061,7 @@ msgstr ""
 "Ubuncani"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_SQL_INTERNATIONAL\n"
@@ -2275,6 +2281,7 @@ msgid " (read-only)"
 msgstr " (funda kuphela)"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_STR_ALREADYEXISTOVERWRITE\n"
diff --git a/source/nr/svx/source/gallery2.po b/source/nr/svx/source/gallery2.po
index 9adfb8bd0ae..00dbde32d5e 100644
--- a/source/nr/svx/source/gallery2.po
+++ b/source/nr/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 10:42+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1356518555.0\n"
 
 #: gallery.src
@@ -1150,6 +1150,7 @@ msgid "Computer - WIFI"
 msgstr ""
 
 #: galtheme.src
+#, fuzzy
 msgctxt ""
 "galtheme.src\n"
 "RID_GALLERYSTR_THEME_NUMBERS\n"
@@ -1174,6 +1175,7 @@ msgid "Signs - danger"
 msgstr ""
 
 #: galtheme.src
+#, fuzzy
 msgctxt ""
 "galtheme.src\n"
 "RID_GALLERYSTR_THEME_OBJECTS\n"
diff --git a/source/nr/svx/source/src.po b/source/nr/svx/source/src.po
index ef577c0c68d..b5406fb4fc7 100644
--- a/source/nr/svx/source/src.po
+++ b/source/nr/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 00:56+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: app.src
 msgctxt ""
@@ -239,6 +239,7 @@ msgid "Action not supported"
 msgstr "Isenzo asisekelwa"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRHDL\n"
diff --git a/source/nr/svx/source/svdraw.po b/source/nr/svx/source/svdraw.po
index abcae46e4e8..27c416ad7d5 100644
--- a/source/nr/svx/source/svdraw.po
+++ b/source/nr/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 00:56+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: svdstr.src
 msgctxt ""
@@ -4847,6 +4847,7 @@ msgid "Delete column"
 msgstr "Sula ikholomu"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_UNDO_ROW_DELETE\n"
@@ -4915,6 +4916,7 @@ msgid "Table style settings"
 msgstr ""
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNameSingulTable\n"
@@ -4943,6 +4945,7 @@ msgstr ""
 "Theyibula"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNamePluralTable\n"
@@ -4963,6 +4966,7 @@ msgstr ""
 "Amathebula"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNameSingulFONTWORK\n"
@@ -4977,6 +4981,7 @@ msgstr ""
 "Umsebenzi wefonti"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNamePluralFONTWORK\n"
diff --git a/source/nr/svx/source/tbxctrls.po b/source/nr/svx/source/tbxctrls.po
index f79e71d2240..f5ac0dcbcdf 100644
--- a/source/nr/svx/source/tbxctrls.po
+++ b/source/nr/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 00:56+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: colrctrl.src
 msgctxt ""
@@ -715,6 +715,7 @@ msgid "More..."
 msgstr "Khulu..."
 
 #: tbcontrl.src
+#, fuzzy
 msgctxt ""
 "tbcontrl.src\n"
 "RID_SVXSTR_TEXTCOLOR\n"
@@ -747,6 +748,7 @@ msgid "Font Name. The current font is not available and will be substituted."
 msgstr ""
 
 #: tbunosearchcontrollers.src
+#, fuzzy
 msgctxt ""
 "tbunosearchcontrollers.src\n"
 "RID_SVXSTR_FINDBAR_FIND\n"