Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

2 files changed, 22 insertions, 6 deletions

diff --git a/source/ve/extensions/source/propctrlr.po b/source/ve/extensions/source/propctrlr.po
index 3a1f1f83ffa..5d4a5499e5e 100644
--- a/source/ve/extensions/source/propctrlr.po
+++ b/source/ve/extensions/source/propctrlr.po
@@ -1,4 +1,4 @@
-#. extracted from extensions/source/propctrlr
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:41+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029676.0\n"
 
 #: fontdialog.src
@@ -317,6 +317,7 @@ msgid "Vert. Alignment"
 msgstr ""
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_VERTICAL_ALIGN\n"
@@ -351,6 +352,7 @@ msgid "Middle"
 msgstr "Vhukati"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_VERTICAL_ALIGN\n"
@@ -1059,6 +1061,7 @@ msgid "Tablefields"
 msgstr ""
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_ALIGNMENT\n"
@@ -1093,6 +1096,7 @@ msgid "Center"
 msgstr "Vhukati"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_ALIGNMENT\n"
@@ -2056,6 +2060,7 @@ msgid "Default"
 msgstr "Tshi~dzivhiswa"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_PUSHBUTTONTYPE\n"
@@ -2073,6 +2078,7 @@ msgstr ""
 "Zwo Luga"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_PUSHBUTTONTYPE\n"
@@ -2484,6 +2490,7 @@ msgid "Text type"
 msgstr "Lushaka lwa ḽiṅwalwa"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_SHOWHIDE\n"
@@ -2816,6 +2823,7 @@ msgid "Text direction"
 msgstr "Buḓo ḽa ḽiṅwalwa"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_WRITING_MODE\n"
@@ -2829,6 +2837,7 @@ msgstr ""
 "Monde-uya-kha-tshauḽa"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_WRITING_MODE\n"
@@ -2950,6 +2959,7 @@ msgstr "Kha ~Sele"
 
 #. That's the 'Regular' as used for a font style (as opposed to 'italic' and 'bold'), so please use a consistent translation.
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_STR_FONTSTYLE_REGULAR\n"
@@ -2972,6 +2982,7 @@ msgstr "Ḽeḓeretsendama yo swifhadzwaho"
 
 #. 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"
@@ -3001,6 +3012,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/ve/extensions/source/update/check.po b/source/ve/extensions/source/update/check.po
index 1f057cead4e..773ecbdfd66 100644
--- a/source/ve/extensions/source/update/check.po
+++ b/source/ve/extensions/source/update/check.po
@@ -1,4 +1,4 @@
-#. extracted from extensions/source/update/check
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 04:24+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: updatehdl.src
 msgctxt ""
@@ -212,6 +212,7 @@ msgid "%PERCENT%"
 msgstr ""
 
 #: updatehdl.src
+#, fuzzy
 msgctxt ""
 "updatehdl.src\n"
 "RID_UPDATE_FT_STATUS\n"
@@ -230,6 +231,7 @@ msgstr ""
 "Maimo"
 
 #: updatehdl.src
+#, fuzzy
 msgctxt ""
 "updatehdl.src\n"
 "RID_UPDATE_FT_DESCRIPTION\n"
@@ -252,6 +254,7 @@ msgstr ""
 "Ṱhalutshedzo"
 
 #: updatehdl.src
+#, fuzzy
 msgctxt ""
 "updatehdl.src\n"
 "RID_UPDATE_BTN_CLOSE\n"
@@ -310,6 +313,7 @@ msgid "~Resume"
 msgstr ""
 
 #: updatehdl.src
+#, fuzzy
 msgctxt ""
 "updatehdl.src\n"
 "RID_UPDATE_BTN_CANCEL\n"