Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

6 files changed, 35 insertions, 18 deletions

diff --git a/source/st/svx/source/dialog.po b/source/st/svx/source/dialog.po
index 0f4131ec2af..aed58106ab5 100644
--- a/source/st/svx/source/dialog.po
+++ b/source/st/svx/source/dialog.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/dialog
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:25+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: st\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: st\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366028738.0\n"
 
 #: bmpmask.src
@@ -534,6 +534,7 @@ msgid ""
 msgstr ""
 
 #: docrecovery.src
+#, fuzzy
 msgctxt ""
 "docrecovery.src\n"
 "RID_SVXPAGE_DOCRECOVERY_RECOVER\n"
@@ -3071,6 +3072,7 @@ msgid "Horizontal Green"
 msgstr "Ho rapamela ka hare"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT41\n"
@@ -4032,6 +4034,7 @@ msgid "Files Found"
 msgstr "Faele ha e fumanwe: "
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GALLERY_PREVIEW\n"
diff --git a/source/st/svx/source/form.po b/source/st/svx/source/form.po
index ccdeadf421e..f6b95c4ddc0 100644
--- a/source/st/svx/source/form.po
+++ b/source/st/svx/source/form.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/form
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:25+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: st\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: st\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366028739.0\n"
 
 #: datanavi.src
@@ -1419,6 +1419,7 @@ msgid "Form"
 msgstr "Diforomo"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_TABWIN_PREFIX\n"
@@ -1450,6 +1451,7 @@ msgstr ""
 "Lenane"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_TABWIN_PREFIX\n"
@@ -2029,6 +2031,7 @@ msgid "Count"
 msgstr "Bala"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_SQL_INTERNATIONAL\n"
@@ -2042,6 +2045,7 @@ msgstr ""
 "Boholo"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_SQL_INTERNATIONAL\n"
@@ -2055,6 +2059,7 @@ msgstr ""
 "Bonnyane"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_SQL_INTERNATIONAL\n"
@@ -2274,6 +2279,7 @@ msgid " (read-only)"
 msgstr " (bala-fela)"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_STR_ALREADYEXISTOVERWRITE\n"
diff --git a/source/st/svx/source/gallery2.po b/source/st/svx/source/gallery2.po
index 70a658fe572..67af2ed08d3 100644
--- a/source/st/svx/source/gallery2.po
+++ b/source/st/svx/source/gallery2.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/gallery2
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-12-26 10:34+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: st\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: st\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1356518063.0\n"
 
 #: gallery.src
@@ -1167,6 +1167,7 @@ msgid "Signs - danger"
 msgstr ""
 
 #: galtheme.src
+#, fuzzy
 msgctxt ""
 "galtheme.src\n"
 "RID_GALLERYSTR_THEME_OBJECTS\n"
diff --git a/source/st/svx/source/src.po b/source/st/svx/source/src.po
index b56f58f838b..7afe90294f9 100644
--- a/source/st/svx/source/src.po
+++ b/source/st/svx/source/src.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/src
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:20+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: st\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: st\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: app.src
 msgctxt ""
@@ -33,6 +33,7 @@ msgid "Error"
 msgstr "Phoso"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRCTX\n"
@@ -248,6 +249,7 @@ msgid "Action not supported"
 msgstr "Ketso ha e tshehetswe"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRHDL\n"
diff --git a/source/st/svx/source/svdraw.po b/source/st/svx/source/svdraw.po
index 73646f57b53..b5bf18f7361 100644
--- a/source/st/svx/source/svdraw.po
+++ b/source/st/svx/source/svdraw.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/svdraw
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:20+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: st\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: st\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: svdstr.src
 msgctxt ""
@@ -4912,6 +4912,7 @@ msgid "Table style settings"
 msgstr ""
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNameSingulTable\n"
@@ -4942,6 +4943,7 @@ msgstr ""
 "Lenane"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNamePluralTable\n"
@@ -4962,6 +4964,7 @@ msgstr ""
 "Manane"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNameSingulFONTWORK\n"
@@ -4976,6 +4979,7 @@ msgstr ""
 "Mosebetsi wa fonte"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNamePluralFONTWORK\n"
diff --git a/source/st/svx/source/tbxctrls.po b/source/st/svx/source/tbxctrls.po
index 533ef3df168..6111c1c652b 100644
--- a/source/st/svx/source/tbxctrls.po
+++ b/source/st/svx/source/tbxctrls.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/tbxctrls
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:20+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: st\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: st\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: colrctrl.src
 msgctxt ""
@@ -716,6 +716,7 @@ msgid "More..."
 msgstr "Ho feta..."
 
 #: tbcontrl.src
+#, fuzzy
 msgctxt ""
 "tbcontrl.src\n"
 "RID_SVXSTR_TEXTCOLOR\n"