Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

2 files changed, 21 insertions, 6 deletions

diff --git a/source/brx/extensions/source/propctrlr.po b/source/brx/extensions/source/propctrlr.po
index 5e57ea2cd1e..3b0b1a0c5a7 100644
--- a/source/brx/extensions/source/propctrlr.po
+++ b/source/brx/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: 2011-04-11 23:48+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: brx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: brx\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: fontdialog.src
 msgctxt ""
@@ -315,6 +315,7 @@ msgid "Vert. Alignment"
 msgstr ""
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_VERTICAL_ALIGN\n"
@@ -349,6 +350,7 @@ msgid "Middle"
 msgstr ""
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_VERTICAL_ALIGN\n"
@@ -1066,6 +1068,7 @@ msgid "Left"
 msgstr "आगसि"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_ALIGNMENT\n"
@@ -2037,6 +2040,7 @@ msgid "OK"
 msgstr "OK"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_PUSHBUTTONTYPE\n"
@@ -2448,6 +2452,7 @@ msgid "Text type"
 msgstr "फराय बिजाब रोखोम"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_SHOWHIDE\n"
@@ -2461,6 +2466,7 @@ msgstr ""
 "एरसो"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_SHOWHIDE\n"
@@ -2786,6 +2792,7 @@ msgid "Text direction"
 msgstr "फराय बिजाब बिथिं"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_WRITING_MODE\n"
@@ -2799,6 +2806,7 @@ msgstr ""
 "आगसि निफ्राय आगदा सिम"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_WRITING_MODE\n"
@@ -2920,6 +2928,7 @@ msgstr "~खथासा सिम"
 
 #. 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"
@@ -2942,6 +2951,7 @@ msgstr "बल्ड फारसे खेंख्रा हांखो"
 
 #. 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"
@@ -2969,6 +2979,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/brx/extensions/source/update/check.po b/source/brx/extensions/source/update/check.po
index e77ba614d2f..0de9ac582d7 100644
--- a/source/brx/extensions/source/update/check.po
+++ b/source/brx/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 09:26+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: brx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: brx\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: updatehdl.src
 msgctxt ""
@@ -195,6 +195,7 @@ msgid "Reload File"
 msgstr "फ्रेम फिन ल'ड खालाम"
 
 #: 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"
@@ -231,6 +233,7 @@ msgstr ""
 "थाखोमान"
 
 #: updatehdl.src
+#, fuzzy
 msgctxt ""
 "updatehdl.src\n"
 "RID_UPDATE_FT_DESCRIPTION\n"
@@ -289,6 +292,7 @@ msgid "~Resume"
 msgstr ""
 
 #: updatehdl.src
+#, fuzzy
 msgctxt ""
 "updatehdl.src\n"
 "RID_UPDATE_BTN_CANCEL\n"