Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

3 files changed, 23 insertions, 9 deletions

diff --git a/source/nr/extensions/source/abpilot.po b/source/nr/extensions/source/abpilot.po
index 8542d4d79d6..f3417870e80 100644
--- a/source/nr/extensions/source/abpilot.po
+++ b/source/nr/extensions/source/abpilot.po
@@ -1,4 +1,4 @@
-#. extracted from extensions/source/abpilot
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 01:06+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"
 
 #: abspilot.src
 msgctxt ""
@@ -275,6 +275,7 @@ msgid "Location"
 msgstr "Indawo"
 
 #: abspilot.src
+#, fuzzy
 msgctxt ""
 "abspilot.src\n"
 "RID_PAGE_FINAL\n"
diff --git a/source/nr/extensions/source/propctrlr.po b/source/nr/extensions/source/propctrlr.po
index c7d6fa23c67..5f992b00dc2 100644
--- a/source/nr/extensions/source/propctrlr.po
+++ b/source/nr/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:00+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: 1366027222.0\n"
 
 #: fontdialog.src
@@ -334,6 +334,7 @@ msgid "Middle"
 msgstr "Phakathi"
 
 #: 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"
@@ -1076,6 +1078,7 @@ msgid "Center"
 msgstr "Phakathi"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_ALIGNMENT\n"
@@ -1515,6 +1518,7 @@ msgid "Multi"
 msgstr ""
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_SELECTION_TYPE\n"
@@ -2045,6 +2049,7 @@ msgid "Default"
 msgstr "Ok~onakeleko"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_PUSHBUTTONTYPE\n"
@@ -2062,6 +2067,7 @@ msgstr ""
 "Kulungile"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_PUSHBUTTONTYPE\n"
@@ -2801,6 +2807,7 @@ msgid "Text direction"
 msgstr "Ukunqotjhiswa kwetheksti"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_WRITING_MODE\n"
@@ -2814,6 +2821,7 @@ msgstr ""
 "Ngesinceleni ukuya ngesidleni"
 
 #: formres.src
+#, fuzzy
 msgctxt ""
 "formres.src\n"
 "RID_RSC_ENUM_WRITING_MODE\n"
@@ -2935,6 +2943,7 @@ msgstr "E~selini"
 
 #. 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"
@@ -2957,6 +2966,7 @@ msgstr "I-italiki edege"
 
 #. 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"
@@ -2986,6 +2996,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/nr/extensions/source/update/check.po b/source/nr/extensions/source/update/check.po
index 75e87307200..5fd32b05f14 100644
--- a/source/nr/extensions/source/update/check.po
+++ b/source/nr/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 01:06+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"
 
 #: updatehdl.src
 msgctxt ""
@@ -211,6 +211,7 @@ msgid "%PERCENT%"
 msgstr ""
 
 #: updatehdl.src
+#, fuzzy
 msgctxt ""
 "updatehdl.src\n"
 "RID_UPDATE_FT_STATUS\n"
@@ -277,6 +278,7 @@ msgid "~Resume"
 msgstr ""
 
 #: updatehdl.src
+#, fuzzy
 msgctxt ""
 "updatehdl.src\n"
 "RID_UPDATE_BTN_CANCEL\n"