Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

10 files changed, 54 insertions, 30 deletions

diff --git a/source/nr/sw/source/core/undo.po b/source/nr/sw/source/core/undo.po
index a15b34b0848..dccf8814dbd 100644
--- a/source/nr/sw/source/core/undo.po
+++ b/source/nr/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:01+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: 1366027267.0\n"
 
 #: undo.src
@@ -56,6 +56,7 @@ msgid "New Paragraph"
 msgstr "Ipharagrafu etja"
 
 #: undo.src
+#, fuzzy
 msgctxt ""
 "undo.src\n"
 "STR_MOVE_UNDO\n"
diff --git a/source/nr/sw/source/core/unocore.po b/source/nr/sw/source/core/unocore.po
index 3e5c98e1cf5..dfd2a6e9720 100644
--- a/source/nr/sw/source/core/unocore.po
+++ b/source/nr/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 01:08+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"
 
 #: unocore.src
 msgctxt ""
@@ -31,6 +31,7 @@ msgid "Column %COLUMNLETTER"
 msgstr ""
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_CHARACTER\n"
@@ -53,6 +54,7 @@ msgstr ""
 "Itshwayo"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_PARAGRAPH\n"
@@ -71,6 +73,7 @@ msgstr ""
 "Ipharagrafu"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_FRAME\n"
@@ -95,6 +98,7 @@ msgid "Pages"
 msgstr "Amakhasi"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_NUMBERING\n"
diff --git a/source/nr/sw/source/ui/app.po b/source/nr/sw/source/ui/app.po
index 5de276cabcc..1f00b1bdb74 100644
--- a/source/nr/sw/source/ui/app.po
+++ b/source/nr/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:01+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: 1366027268.0\n"
 
 #: app.src
@@ -1478,6 +1478,7 @@ msgid "Subscript"
 msgstr "Tlola ngehla kwelayini"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_TEXT_ATTR\n"
@@ -1495,6 +1496,7 @@ msgstr ""
 "In~dlela"
 
 #: 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/nr/sw/source/ui/config.po b/source/nr/sw/source/ui/config.po
index 407e43c188d..b109f3a071f 100644
--- a/source/nr/sw/source/ui/config.po
+++ b/source/nr/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 04:08+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"
 
 #: mailconfigpage.src
 msgctxt ""
@@ -520,6 +520,7 @@ msgid "Basic fonts (%1)"
 msgstr "Amafonti asisekelo (%1)"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "TP_STD_FONT\n"
@@ -543,6 +544,7 @@ msgstr ""
 "Ifonti"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "TP_STD_FONT\n"
@@ -1166,6 +1168,7 @@ msgid "~Use only paper tray from printer preferences"
 msgstr ""
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1879,6 +1882,7 @@ msgid "Char"
 msgstr ""
 
 #: optload.src
+#, fuzzy
 msgctxt ""
 "optload.src\n"
 "STR_ARR_METRIC\n"
diff --git a/source/nr/sw/source/ui/dbui.po b/source/nr/sw/source/ui/dbui.po
index 177113a9f48..21a2b174998 100644
--- a/source/nr/sw/source/ui/dbui.po
+++ b/source/nr/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 10:43+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: 1356518580.0\n"
 
 #: addresslistdialog.src
@@ -2312,6 +2312,7 @@ msgid "Sen~d as"
 msgstr "Thumel~a kuyi"
 
 #: mmoutputpage.src
+#, fuzzy
 msgctxt ""
 "mmoutputpage.src\n"
 "DLG_MM_OUTPUT_PAGE\n"
diff --git a/source/nr/sw/source/ui/docvw.po b/source/nr/sw/source/ui/docvw.po
index 744d0607279..b75664d7c95 100644
--- a/source/nr/sw/source/ui/docvw.po
+++ b/source/nr/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-09 22:51+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"
 
 #: access.src
 msgctxt ""
@@ -127,6 +127,7 @@ msgid "Page: $(ARG1)"
 msgstr "Ikhasi: $(ARG1)"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_ANNOTATION_AUTHOR_NAME\n"
@@ -151,6 +152,7 @@ msgstr ""
 "Umtloli"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_ANNOTATION_DATE_NAME\n"
@@ -209,6 +211,7 @@ msgid "Document preview"
 msgstr "Ukubona umtlolo"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_PREVIEW_DOC_SUFFIX\n"
diff --git a/source/nr/sw/source/ui/envelp.po b/source/nr/sw/source/ui/envelp.po
index 945daf6895e..d09e0cf82fa 100644
--- a/source/nr/sw/source/ui/envelp.po
+++ b/source/nr/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 00:56+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"
 
 #: envelp.src
 msgctxt ""
@@ -1235,6 +1235,7 @@ msgid "Field"
 msgstr "ifildi"
 
 #: mailmrge.src
+#, fuzzy
 msgctxt ""
 "mailmrge.src\n"
 "DLG_MAILMERGE\n"
diff --git a/source/nr/sw/source/ui/index.po b/source/nr/sw/source/ui/index.po
index 13f1afa3033..67006a31852 100644
--- a/source/nr/sw/source/ui/index.po
+++ b/source/nr/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 14:15+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"
 
 #: cnttab.src
 msgctxt ""
@@ -1246,6 +1246,7 @@ msgid "Assignment"
 msgstr "I-asayinimente"
 
 #: cnttab.src
+#, fuzzy
 msgctxt ""
 "cnttab.src\n"
 "DLG_ADD_IDX_STYLES\n"
@@ -1271,6 +1272,7 @@ msgstr ""
 "Ngesinceleni"
 
 #: cnttab.src
+#, fuzzy
 msgctxt ""
 "cnttab.src\n"
 "DLG_ADD_IDX_STYLES\n"
diff --git a/source/nr/sw/source/ui/lingu.po b/source/nr/sw/source/ui/lingu.po
index 3d6ae285002..bb474f0ed66 100644
--- a/source/nr/sw/source/ui/lingu.po
+++ b/source/nr/sw/source/ui/lingu.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/lingu
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ 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: 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"
 
 #: olmenu.src
 msgctxt ""
@@ -126,6 +126,7 @@ msgid "Reset to Default Language"
 msgstr ""
 
 #: olmenu.src
+#, fuzzy
 msgctxt ""
 "olmenu.src\n"
 "STR_LANGSTATUS_MORE\n"
diff --git a/source/nr/sw/source/ui/utlui.po b/source/nr/sw/source/ui/utlui.po
index e6d05b142d3..d0d734e7ac7 100644
--- a/source/nr/sw/source/ui/utlui.po
+++ b/source/nr/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:01+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: 1366027273.0\n"
 
 #: attrdesc.src
@@ -951,6 +951,7 @@ msgid "Keywords"
 msgstr "Amagama amakhulu"
 
 #: initui.src
+#, fuzzy
 msgctxt ""
 "initui.src\n"
 "RID_SW_SHELLRES\n"
@@ -2059,6 +2060,7 @@ msgid "Endnote Characters"
 msgstr "Amatshwayo wama-Endnoti"
 
 #: poolfmt.src
+#, fuzzy
 msgctxt ""
 "poolfmt.src\n"
 "STR_POOLPAGE_LANDSCAPE\n"
@@ -3840,6 +3842,7 @@ msgid "Draw objects"
 msgstr "Gwala izinto"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_POSTIT\n"
@@ -4004,6 +4007,7 @@ msgid "Index"
 msgstr "~Indeksi"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_SINGLE_POSTIT\n"