Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

9 files changed, 56 insertions, 27 deletions

diff --git a/source/ts/sw/source/core/undo.po b/source/ts/sw/source/core/undo.po
index bdd255a10a3..07232b8c1bc 100644
--- a/source/ts/sw/source/core/undo.po
+++ b/source/ts/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:35+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029315.0\n"
 
 #: undo.src
@@ -56,6 +56,7 @@ msgid "New Paragraph"
 msgstr "Ndzimana yintshwa"
 
 #: undo.src
+#, fuzzy
 msgctxt ""
 "undo.src\n"
 "STR_MOVE_UNDO\n"
diff --git a/source/ts/sw/source/core/unocore.po b/source/ts/sw/source/core/unocore.po
index e0a6d2baaef..258684503d9 100644
--- a/source/ts/sw/source/core/unocore.po
+++ b/source/ts/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 04:06+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\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"
@@ -55,6 +56,7 @@ msgstr ""
 "Letere"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_PARAGRAPH\n"
@@ -73,6 +75,7 @@ msgstr ""
 "Ndzimana"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_FRAME\n"
@@ -89,6 +92,7 @@ msgstr ""
 "Rimba"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_PAGE\n"
@@ -109,6 +113,7 @@ msgstr ""
 "Mapheji"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_NUMBERING\n"
diff --git a/source/ts/sw/source/ui/app.po b/source/ts/sw/source/ui/app.po
index 12d8ffce7c9..0e54c0b7487 100644
--- a/source/ts/sw/source/ui/app.po
+++ b/source/ts/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:35+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029316.0\n"
 
 #: app.src
@@ -1478,6 +1478,7 @@ msgid "Subscript"
 msgstr "Xikiripiti xa le hansi"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_TEXT_ATTR\n"
@@ -1495,6 +1496,7 @@ msgstr ""
 "Xi~tayele"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_TEXT_ATTR.MN_FORMAT_ALGN\n"
@@ -1663,6 +1665,7 @@ msgid "Continue previous numbering"
 msgstr ""
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "_NUMBERING_RELATED_MENU\n"
diff --git a/source/ts/sw/source/ui/config.po b/source/ts/sw/source/ui/config.po
index 15d6035ef36..69a8afc086f 100644
--- a/source/ts/sw/source/ui/config.po
+++ b/source/ts/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 06:16+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: mailconfigpage.src
 msgctxt ""
@@ -520,6 +520,7 @@ msgid "Basic fonts (%1)"
 msgstr "Tifonti ta masungulo (%1)"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "TP_STD_FONT\n"
@@ -1047,6 +1048,7 @@ msgid "%PRODUCTNAME %s"
 msgstr "Ntirho wa %PRODUCTNAME"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1107,6 +1109,7 @@ msgid "Form control~s"
 msgstr "Ku lawula ka khesara"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1135,6 +1138,7 @@ msgid "Print text in blac~k"
 msgstr "Printa eka fayili"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1273,6 +1277,7 @@ msgid "Include"
 msgstr "Katsa"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1322,6 +1327,7 @@ msgid "~All pages"
 msgstr ""
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1343,6 +1349,7 @@ msgstr ""
 "Mapheji"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -2036,6 +2043,7 @@ msgid "Background color"
 msgstr "Muhlovo wa vuyimelo"
 
 #: redlopt.src
+#, fuzzy
 msgctxt ""
 "redlopt.src\n"
 "TP_REDLINE_OPT\n"
@@ -2082,6 +2090,7 @@ msgid "Attributes"
 msgstr "Swihlawulekisi"
 
 #: redlopt.src
+#, fuzzy
 msgctxt ""
 "redlopt.src\n"
 "TP_REDLINE_OPT\n"
@@ -2128,6 +2137,7 @@ msgid "Attributes"
 msgstr "Swihlawulekisi"
 
 #: redlopt.src
+#, fuzzy
 msgctxt ""
 "redlopt.src\n"
 "TP_REDLINE_OPT\n"
diff --git a/source/ts/sw/source/ui/dbui.po b/source/ts/sw/source/ui/dbui.po
index bfad38f108d..9118478f8c3 100644
--- a/source/ts/sw/source/ui/dbui.po
+++ b/source/ts/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:39+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1356521949.0\n"
 
 #: addresslistdialog.src
@@ -2312,6 +2312,7 @@ msgid "Sen~d as"
 msgstr "Rhume~a tanihi"
 
 #: mmoutputpage.src
+#, fuzzy
 msgctxt ""
 "mmoutputpage.src\n"
 "DLG_MM_OUTPUT_PAGE\n"
diff --git a/source/ts/sw/source/ui/docvw.po b/source/ts/sw/source/ui/docvw.po
index 9f04261c785..db588854b3f 100644
--- a/source/ts/sw/source/ui/docvw.po
+++ b/source/ts/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:46+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: access.src
 msgctxt ""
@@ -135,6 +135,7 @@ msgid "Author"
 msgstr "Mutsari"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_ANNOTATION_DATE_NAME\n"
@@ -193,6 +194,7 @@ msgid "Document preview"
 msgstr "Ku languta dokumente"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_PREVIEW_DOC_SUFFIX\n"
diff --git a/source/ts/sw/source/ui/envelp.po b/source/ts/sw/source/ui/envelp.po
index 7bcffb62afb..56ec099765b 100644
--- a/source/ts/sw/source/ui/envelp.po
+++ b/source/ts/sw/source/ui/envelp.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/envelp
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:26+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: envelp.src
 msgctxt ""
@@ -1235,6 +1235,7 @@ msgid "Field"
 msgstr "xivandla"
 
 #: mailmrge.src
+#, fuzzy
 msgctxt ""
 "mailmrge.src\n"
 "DLG_MAILMERGE\n"
diff --git a/source/ts/sw/source/ui/index.po b/source/ts/sw/source/ui/index.po
index d2ce2c3a14b..27acf27266a 100644
--- a/source/ts/sw/source/ui/index.po
+++ b/source/ts/sw/source/ui/index.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/index
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-01-05 15:03+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: cnttab.src
 msgctxt ""
@@ -1246,6 +1246,7 @@ msgid "Assignment"
 msgstr "Asayinimente"
 
 #: cnttab.src
+#, fuzzy
 msgctxt ""
 "cnttab.src\n"
 "DLG_ADD_IDX_STYLES\n"
@@ -1271,6 +1272,7 @@ msgstr ""
 "Ximatsi"
 
 #: cnttab.src
+#, fuzzy
 msgctxt ""
 "cnttab.src\n"
 "DLG_ADD_IDX_STYLES\n"
diff --git a/source/ts/sw/source/ui/utlui.po b/source/ts/sw/source/ui/utlui.po
index 5e08a49c1b4..2a42cc8aebe 100644
--- a/source/ts/sw/source/ui/utlui.po
+++ b/source/ts/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:35+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029321.0\n"
 
 #: attrdesc.src
@@ -951,6 +951,7 @@ msgid "Keywords"
 msgstr "Marito ya nkoka"
 
 #: initui.src
+#, fuzzy
 msgctxt ""
 "initui.src\n"
 "RID_SW_SHELLRES\n"
@@ -2059,6 +2060,7 @@ msgid "Endnote Characters"
 msgstr "Swivumbeko swa nkatsakanyo wa le makumu"
 
 #: poolfmt.src
+#, fuzzy
 msgctxt ""
 "poolfmt.src\n"
 "STR_POOLPAGE_LANDSCAPE\n"
@@ -3840,6 +3842,7 @@ msgid "Draw objects"
 msgstr "Pfampfarhuta xanchumu"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_POSTIT\n"
@@ -4004,6 +4007,7 @@ msgid "Index"
 msgstr "~Xikombo"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_SINGLE_POSTIT\n"