Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

7 files changed, 34 insertions, 21 deletions

diff --git a/source/ss/sw/source/core/undo.po b/source/ss/sw/source/core/undo.po
index e8b98c2d347..dcff73948ef 100644
--- a/source/ss/sw/source/core/undo.po
+++ b/source/ss/sw/source/core/undo.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/core/undo
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:24+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ss\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ss\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366028670.0\n"
 
 #: undo.src
@@ -56,6 +56,7 @@ msgid "New Paragraph"
 msgstr "Ipharagrafu lensha"
 
 #: undo.src
+#, fuzzy
 msgctxt ""
 "undo.src\n"
 "STR_MOVE_UNDO\n"
diff --git a/source/ss/sw/source/core/unocore.po b/source/ss/sw/source/core/unocore.po
index caf1048445a..c820cb28369 100644
--- a/source/ss/sw/source/core/unocore.po
+++ b/source/ss/sw/source/core/unocore.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/core/unocore
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 02:11+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ss\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ss\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: unocore.src
 msgctxt ""
@@ -31,6 +31,7 @@ msgid "Column %COLUMNLETTER"
 msgstr ""
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_CHARACTER\n"
@@ -63,6 +64,7 @@ msgid "Paragraph"
 msgstr "Ipharagrafu"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_FRAME\n"
diff --git a/source/ss/sw/source/ui/app.po b/source/ss/sw/source/ui/app.po
index b0b3cee6c2f..4c91bfc63c8 100644
--- a/source/ss/sw/source/ui/app.po
+++ b/source/ss/sw/source/ui/app.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/app
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:24+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ss\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ss\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366028670.0\n"
 
 #: app.src
@@ -1478,6 +1478,7 @@ msgid "Subscript"
 msgstr "Lokusabangumbhalo"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_TEXT_ATTR\n"
@@ -1495,6 +1496,7 @@ msgstr ""
 "Sita~yela"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_TEXT_ATTR.MN_FORMAT_ALGN\n"
diff --git a/source/ss/sw/source/ui/config.po b/source/ss/sw/source/ui/config.po
index 0dfd0cb8502..566ba01b792 100644
--- a/source/ss/sw/source/ui/config.po
+++ b/source/ss/sw/source/ui/config.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/config
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-02-22 05:34+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ss\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ss\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: mailconfigpage.src
 msgctxt ""
@@ -529,6 +529,7 @@ msgid "Font"
 msgstr "Ifonti"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "TP_STD_FONT\n"
@@ -1251,6 +1252,7 @@ msgid "Include"
 msgstr "Faka ekhatsi"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1309,6 +1311,7 @@ msgid "Pa~ges"
 msgstr "Emapheji"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
diff --git a/source/ss/sw/source/ui/dbui.po b/source/ss/sw/source/ui/dbui.po
index 65a8d31a0a7..1c50608a34f 100644
--- a/source/ss/sw/source/ui/dbui.po
+++ b/source/ss/sw/source/ui/dbui.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/dbui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-12-26 11:12+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ss\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ss\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1356520327.0\n"
 
 #: addresslistdialog.src
@@ -2312,6 +2312,7 @@ msgid "Sen~d as"
 msgstr "Tfu~mela njenge"
 
 #: mmoutputpage.src
+#, fuzzy
 msgctxt ""
 "mmoutputpage.src\n"
 "DLG_MM_OUTPUT_PAGE\n"
diff --git a/source/ss/sw/source/ui/docvw.po b/source/ss/sw/source/ui/docvw.po
index 2d4ea20a0dc..25e44f932d8 100644
--- a/source/ss/sw/source/ui/docvw.po
+++ b/source/ss/sw/source/ui/docvw.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/docvw
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-05-10 07:24+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ss\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ss\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: access.src
 msgctxt ""
@@ -167,6 +167,7 @@ msgid "Document preview"
 msgstr "Kubukwa kwedokhumenti"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_PREVIEW_DOC_SUFFIX\n"
diff --git a/source/ss/sw/source/ui/utlui.po b/source/ss/sw/source/ui/utlui.po
index 690ececca77..f3fed884e13 100644
--- a/source/ss/sw/source/ui/utlui.po
+++ b/source/ss/sw/source/ui/utlui.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/utlui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:24+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ss\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ss\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366028676.0\n"
 
 #: attrdesc.src
@@ -951,6 +951,7 @@ msgid "Keywords"
 msgstr "Sikhiyagama"
 
 #: initui.src
+#, fuzzy
 msgctxt ""
 "initui.src\n"
 "RID_SW_SHELLRES\n"
@@ -3836,6 +3837,7 @@ msgid "Draw objects"
 msgstr "Dvweba tintfo"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_POSTIT\n"
@@ -4000,6 +4002,7 @@ msgid "Index"
 msgstr "~I-indeksi"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_SINGLE_POSTIT\n"