Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

3 files changed, 32 insertions, 9 deletions

diff --git a/source/nso/cui/source/customize.po b/source/nso/cui/source/customize.po
index 9c95718a040..9066329a51f 100644
--- a/source/nso/cui/source/customize.po
+++ b/source/nso/cui/source/customize.po
@@ -1,4 +1,4 @@
-#. extracted from cui/source/customize
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 00:45+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nso\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nso\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: acccfg.src
 msgctxt ""
@@ -72,6 +72,7 @@ msgid "~Category"
 msgstr "~Legoro"
 
 #: acccfg.src
+#, fuzzy
 msgctxt ""
 "acccfg.src\n"
 "FIXEDTEXT_TEXT_FUNCTION\n"
@@ -90,6 +91,7 @@ msgstr ""
 "Mediro"
 
 #: acccfg.src
+#, fuzzy
 msgctxt ""
 "acccfg.src\n"
 "GROUPBOX_TEXT_FUNCTIONS\n"
@@ -231,6 +233,7 @@ msgid "Begin a Group"
 msgstr ""
 
 #: cfg.src
+#, fuzzy
 msgctxt ""
 "cfg.src\n"
 "TEXT_RENAME\n"
diff --git a/source/nso/cui/source/dialogs.po b/source/nso/cui/source/dialogs.po
index 0a8dc448b55..212a0a4e3d1 100644
--- a/source/nso/cui/source/dialogs.po
+++ b/source/nso/cui/source/dialogs.po
@@ -1,4 +1,4 @@
-#. extracted from cui/source/dialogs
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 15:14+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nso\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nso\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: colorpicker.src
 msgctxt ""
@@ -773,6 +773,7 @@ msgid "Contents:"
 msgstr "Dikagare:"
 
 #: gallery.src
+#, fuzzy
 msgctxt ""
 "gallery.src\n"
 "RID_SVXTABPAGE_GALLERY_GENERAL\n"
@@ -920,6 +921,7 @@ msgid "File"
 msgstr "~Faele"
 
 #: gallery.src
+#, fuzzy
 msgctxt ""
 "gallery.src\n"
 "RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS\n"
@@ -1211,6 +1213,7 @@ msgid "~Find"
 msgstr "~Hwetša"
 
 #: hangulhanjadlg.src
+#, fuzzy
 msgctxt ""
 "hangulhanjadlg.src\n"
 "RID_SVX_MDLG_HANGULHANJA\n"
@@ -1351,6 +1354,7 @@ msgid "Hanja"
 msgstr "Hanja"
 
 #: hangulhanjadlg.src
+#, fuzzy
 msgctxt ""
 "hangulhanjadlg.src\n"
 "RID_SVX_MDLG_HANGULHANJA\n"
@@ -1372,6 +1376,7 @@ msgid "User-defined dictionaries"
 msgstr "Dipukuntšu tša tlhalošo tša modiriši"
 
 #: hangulhanjadlg.src
+#, fuzzy
 msgctxt ""
 "hangulhanjadlg.src\n"
 "RID_SVX_MDLG_HANGULHANJA_OPT\n"
@@ -1421,6 +1426,7 @@ msgid "New..."
 msgstr "Mpsha..."
 
 #: hangulhanjadlg.src
+#, fuzzy
 msgctxt ""
 "hangulhanjadlg.src\n"
 "RID_SVX_MDLG_HANGULHANJA_OPT\n"
@@ -1643,6 +1649,7 @@ msgid "~Login name"
 msgstr "~Leina la go tsena"
 
 #: hyperdlg.src
+#, fuzzy
 msgctxt ""
 "hyperdlg.src\n"
 "RID_SVXPAGE_HYPERLINK_INTERNET\n"
@@ -2595,6 +2602,7 @@ msgid "Password must be confirmed"
 msgstr ""
 
 #: passwdomdlg.src
+#, fuzzy
 msgctxt ""
 "passwdomdlg.src\n"
 "RID_DLG_PASSWORD_TO_OPEN_MODIFY\n"
@@ -3049,6 +3057,7 @@ msgid "Text Format"
 msgstr ""
 
 #: srchxtra.src
+#, fuzzy
 msgctxt ""
 "srchxtra.src\n"
 "RID_SVXDLG_SEARCHATTR\n"
@@ -3168,6 +3177,7 @@ msgid "~Close"
 msgstr "~Tswalela"
 
 #: svuidlg.src
+#, fuzzy
 msgctxt ""
 "svuidlg.src\n"
 "MD_UPDATE_BASELINKS\n"
@@ -3241,6 +3251,7 @@ msgid "Type:"
 msgstr "Mohuta"
 
 #: svuidlg.src
+#, fuzzy
 msgctxt ""
 "svuidlg.src\n"
 "MD_UPDATE_BASELINKS\n"
@@ -3418,6 +3429,7 @@ msgid "File"
 msgstr "~Faele"
 
 #: svuidlg.src
+#, fuzzy
 msgctxt ""
 "svuidlg.src\n"
 "MD_INSERT_OBJECT_APPLET\n"
diff --git a/source/nso/cui/source/tabpages.po b/source/nso/cui/source/tabpages.po
index 0fa09871578..530de8dd615 100644
--- a/source/nso/cui/source/tabpages.po
+++ b/source/nso/cui/source/tabpages.po
@@ -1,4 +1,4 @@
-#. extracted from cui/source/tabpages
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 15:14+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nso\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nso\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: autocdlg.src
 msgctxt ""
@@ -570,6 +570,7 @@ msgid "Currently installed smart tags"
 msgstr "Ditšhupo tše semate tšeo di tsentšhitšwego gabjale"
 
 #: autocdlg.src
+#, fuzzy
 msgctxt ""
 "autocdlg.src\n"
 "RID_OFAPAGE_SMARTTAG_OPTIONS\n"
@@ -1036,6 +1037,7 @@ msgid "Left-to-right (vertical)"
 msgstr "La nngele go ya go la go ja (tsepama)"
 
 #: grfpage.src
+#, fuzzy
 msgctxt ""
 "grfpage.src\n"
 "RID_SVXPAGE_GRFCROP\n"
@@ -1159,6 +1161,7 @@ msgid "H~eight"
 msgstr "Boph~agamo"
 
 #: grfpage.src
+#, fuzzy
 msgctxt ""
 "grfpage.src\n"
 "RID_SVXPAGE_GRFCROP\n"
@@ -1273,6 +1276,7 @@ msgid "From top"
 msgstr "Go tloga godimo"
 
 #: labdlg.src
+#, fuzzy
 msgctxt ""
 "labdlg.src\n"
 "RID_SVXPAGE_CAPTION.LB_ANSATZ\n"
@@ -2592,6 +2596,7 @@ msgid "Example"
 msgstr "Mohlala"
 
 #: paragrph.src
+#, fuzzy
 msgctxt ""
 "paragrph.src\n"
 "STR_PAGE_STYLE\n"
@@ -4457,6 +4462,7 @@ msgid "Arrow style"
 msgstr "Setaele sa mosebe"
 
 #: tabline.src
+#, fuzzy
 msgctxt ""
 "tabline.src\n"
 "RID_SVXPAGE_LINEEND_DEF\n"
@@ -4794,6 +4800,7 @@ msgid "Scroll In"
 msgstr "Sekorolo ka gare"
 
 #: textanim.src
+#, fuzzy
 msgctxt ""
 "textanim.src\n"
 "RID_SVXPAGE_TEXTANIMATION\n"
@@ -4917,6 +4924,7 @@ msgid " Pixel"
 msgstr ""
 
 #: textanim.src
+#, fuzzy
 msgctxt ""
 "textanim.src\n"
 "RID_SVXPAGE_TEXTANIMATION\n"