Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

2 files changed, 19 insertions, 6 deletions

diff --git a/source/ts/extensions/source/propctrlr.po b/source/ts/extensions/source/propctrlr.po
index 9861209aa58..aceb09aaaa2 100644
--- a/source/ts/extensions/source/propctrlr.po
+++ b/source/ts/extensions/source/propctrlr.po
@@ -1,4 +1,4 @@
-#. extracted from extensions/source/propctrlr
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:34+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: 1366029273.0\n"
 
 #: fontdialog.src
@@ -334,6 +334,7 @@ msgid "Middle"
 msgstr "Xikarhi"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_VERTICAL_ALIGN\n"
@@ -1042,6 +1043,7 @@ msgid "Tablefields"
 msgstr ""
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_ALIGNMENT\n"
@@ -1067,6 +1069,7 @@ msgstr ""
 "Ximatsi"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_ALIGNMENT\n"
@@ -1082,6 +1085,7 @@ msgstr ""
 "Xikarhi"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_ALIGNMENT\n"
@@ -1521,6 +1525,7 @@ msgid "Multi"
 msgstr ""
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_SELECTION_TYPE\n"
@@ -2051,6 +2056,7 @@ msgid "Default"
 msgstr "Di~foliti"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_PUSHBUTTONTYPE\n"
@@ -2068,6 +2074,7 @@ msgstr ""
 "Swi Lunghile"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_PUSHBUTTONTYPE\n"
@@ -2951,6 +2958,7 @@ msgstr "Ithaliki yo tikisiwa"
 
 #. That's the 'Italic' as used for a font style, so please use a consistent translation.
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_STR_FONTSTYLE_ITALIC\n"
@@ -2980,6 +2988,7 @@ msgstr ""
 
 #. That's the 'Bold' as used for a font style, so please use a consistent translation.
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_STR_FONTSTYLE_BOLD\n"
diff --git a/source/ts/extensions/source/update/check.po b/source/ts/extensions/source/update/check.po
index e0e3bf68533..d2a5740fca8 100644
--- a/source/ts/extensions/source/update/check.po
+++ b/source/ts/extensions/source/update/check.po
@@ -1,4 +1,4 @@
-#. extracted from extensions/source/update/check
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 04:04+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"
 
 #: updatehdl.src
 msgctxt ""
@@ -195,6 +195,7 @@ msgid "Reload File"
 msgstr "Nghenisa fureme hi vuntshwa"
 
 #: updatehdl.src
+#, fuzzy
 msgctxt ""
 "updatehdl.src\n"
 "RID_UPDATE_STR_RELOAD_CONTINUE\n"
@@ -215,6 +216,7 @@ msgid "%PERCENT%"
 msgstr ""
 
 #: updatehdl.src
+#, fuzzy
 msgctxt ""
 "updatehdl.src\n"
 "RID_UPDATE_FT_STATUS\n"
@@ -233,6 +235,7 @@ msgstr ""
 "Xikhundlha"
 
 #: updatehdl.src
+#, fuzzy
 msgctxt ""
 "updatehdl.src\n"
 "RID_UPDATE_FT_DESCRIPTION\n"
@@ -295,6 +298,7 @@ msgid "~Resume"
 msgstr ""
 
 #: updatehdl.src
+#, fuzzy
 msgctxt ""
 "updatehdl.src\n"
 "RID_UPDATE_BTN_CANCEL\n"