Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

11 files changed, 76 insertions, 33 deletions

diff --git a/source/tn/sw/source/core/undo.po b/source/tn/sw/source/core/undo.po
index 48f5f3e76c7..7ee5ed52c38 100644
--- a/source/tn/sw/source/core/undo.po
+++ b/source/tn/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:33+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029185.0\n"
 
 #: undo.src
@@ -56,6 +56,7 @@ msgid "New Paragraph"
 msgstr "ntsha Temana"
 
 #: undo.src
+#, fuzzy
 msgctxt ""
 "undo.src\n"
 "STR_MOVE_UNDO\n"
@@ -638,6 +639,7 @@ msgid "Split Cells"
 msgstr "Kgaoganya Disele"
 
 #: undo.src
+#, fuzzy
 msgctxt ""
 "undo.src\n"
 "STR_TABLE_MERGE\n"
diff --git a/source/tn/sw/source/core/unocore.po b/source/tn/sw/source/core/unocore.po
index 07119e2daa7..22306329d92 100644
--- a/source/tn/sw/source/core/unocore.po
+++ b/source/tn/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:02+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\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 "Frame"
 msgstr "Kageletso"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_PAGE\n"
diff --git a/source/tn/sw/source/ui/app.po b/source/tn/sw/source/ui/app.po
index a8c6b2a03f8..664f89ca4d4 100644
--- a/source/tn/sw/source/ui/app.po
+++ b/source/tn/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:33+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029186.0\n"
 
 #: app.src
@@ -77,6 +77,7 @@ msgid "Custom Styles"
 msgstr ""
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "DLG_STYLE_DESIGNER.Paragraph Styles\n"
@@ -517,6 +518,7 @@ msgid "(none)"
 msgstr "(sepe)"
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "STR_DOC_STAT\n"
@@ -2373,6 +2375,7 @@ msgid "~Arrange"
 msgstr "Rulaganya"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_ALIGN_FRAME.MN_FORMAT_FRM_HORZ\n"
diff --git a/source/tn/sw/source/ui/config.po b/source/tn/sw/source/ui/config.po
index 0ea63b81cf9..a3c011aff65 100644
--- a/source/tn/sw/source/ui/config.po
+++ b/source/tn/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:08+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: mailconfigpage.src
 msgctxt ""
@@ -78,6 +78,7 @@ msgid "~Server name"
 msgstr ""
 
 #: mailconfigpage.src
+#, fuzzy
 msgctxt ""
 "mailconfigpage.src\n"
 "TP_MAILCONFIG\n"
@@ -161,6 +162,7 @@ msgid "Test Account Settings"
 msgstr ""
 
 #: mailconfigpage.src
+#, fuzzy
 msgctxt ""
 "mailconfigpage.src\n"
 "ST_TASK\n"
@@ -173,6 +175,7 @@ msgstr ""
 "Ditshobokanyo"
 
 #: mailconfigpage.src
+#, fuzzy
 msgctxt ""
 "mailconfigpage.src\n"
 "ST_STATUS\n"
@@ -266,6 +269,7 @@ msgid "~User name"
 msgstr "~Modirisi leina"
 
 #: mailconfigpage.src
+#, fuzzy
 msgctxt ""
 "mailconfigpage.src\n"
 "DLG_MM_SERVERAUTHENTICATION\n"
@@ -556,6 +560,7 @@ msgid "Font"
 msgstr "Mokwalo"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "TP_STD_FONT\n"
@@ -1074,6 +1079,7 @@ msgid "%PRODUCTNAME %s"
 msgstr "%PRODUCTNAME Boalo"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1150,6 +1156,7 @@ msgid "Print text in blac~k"
 msgstr "Gatisa go faele"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1284,6 +1291,7 @@ msgid "Include"
 msgstr "Tsenyeletsa"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1333,6 +1341,7 @@ msgid "~All pages"
 msgstr ""
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
diff --git a/source/tn/sw/source/ui/dbui.po b/source/tn/sw/source/ui/dbui.po
index 906e389edda..7386139d993 100644
--- a/source/tn/sw/source/ui/dbui.po
+++ b/source/tn/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: 2011-04-12 01:14+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: addresslistdialog.src
 msgctxt ""
@@ -122,6 +122,7 @@ msgid "Address Information"
 msgstr ""
 
 #: createaddresslistdialog.src
+#, fuzzy
 msgctxt ""
 "createaddresslistdialog.src\n"
 "DLG_MM_CREATEADDRESSLIST\n"
@@ -579,6 +580,7 @@ msgid "E-mail"
 msgstr "Emeila"
 
 #: dbui.src
+#, fuzzy
 msgctxt ""
 "dbui.src\n"
 "SA_ADDRESS_HEADER\n"
@@ -604,6 +606,7 @@ msgstr ""
 "Setlhogo"
 
 #: dbui.src
+#, fuzzy
 msgctxt ""
 "dbui.src\n"
 "SA_ADDRESS_HEADER\n"
@@ -619,6 +622,7 @@ msgstr ""
 "Leina la ntlha"
 
 #: dbui.src
+#, fuzzy
 msgctxt ""
 "dbui.src\n"
 "SA_ADDRESS_HEADER\n"
@@ -661,6 +665,7 @@ msgid "Address Line 2"
 msgstr ""
 
 #: dbui.src
+#, fuzzy
 msgctxt ""
 "dbui.src\n"
 "SA_ADDRESS_HEADER\n"
@@ -676,6 +681,7 @@ msgstr ""
 "Toropokgolo"
 
 #: dbui.src
+#, fuzzy
 msgctxt ""
 "dbui.src\n"
 "SA_ADDRESS_HEADER\n"
@@ -706,6 +712,7 @@ msgid "ZIP"
 msgstr ""
 
 #: dbui.src
+#, fuzzy
 msgctxt ""
 "dbui.src\n"
 "SA_ADDRESS_HEADER\n"
@@ -1023,6 +1030,7 @@ msgid "Sending E-mail messages"
 msgstr ""
 
 #: mailmergechildwindow.src
+#, fuzzy
 msgctxt ""
 "mailmergechildwindow.src\n"
 "ST_TASK\n"
@@ -1035,6 +1043,7 @@ msgstr ""
 "Ditshobokanyo"
 
 #: mailmergechildwindow.src
+#, fuzzy
 msgctxt ""
 "mailmergechildwindow.src\n"
 "ST_STATUS\n"
@@ -1613,6 +1622,7 @@ msgid "2. Customi~ze salutation"
 msgstr ""
 
 #: mmaddressblockpage.src
+#, fuzzy
 msgctxt ""
 "mmaddressblockpage.src\n"
 "DLG_MM_CUSTOMIZEADDRESSBLOCK\n"
@@ -1754,6 +1764,7 @@ msgid "Matches to field:"
 msgstr ""
 
 #: mmaddressblockpage.src
+#, fuzzy
 msgctxt ""
 "mmaddressblockpage.src\n"
 "DLG_MM_ASSIGNFIELDS\n"
@@ -1966,6 +1977,7 @@ msgid "This document should contain a salutation"
 msgstr ""
 
 #: mmgreetingspage.src
+#, fuzzy
 msgctxt ""
 "mmgreetingspage.src\n"
 "DLG_MM_GREETINGS_PAGE\n"
@@ -2521,6 +2533,7 @@ msgid "E-Mail settings"
 msgstr ""
 
 #: mmoutputpage.src
+#, fuzzy
 msgctxt ""
 "mmoutputpage.src\n"
 "ST_DEFAULTATTACHMENT\n"
@@ -2817,6 +2830,7 @@ msgid "The file you have selected contains more than one table. Please select th
 msgstr ""
 
 #: selectdbtabledialog.src
+#, fuzzy
 msgctxt ""
 "selectdbtabledialog.src\n"
 "DLG_MM_SELECTDBTABLEDDIALOG\n"
diff --git a/source/tn/sw/source/ui/dialog.po b/source/tn/sw/source/ui/dialog.po
index bdf0f683e50..f913c222444 100644
--- a/source/tn/sw/source/ui/dialog.po
+++ b/source/tn/sw/source/ui/dialog.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/dialog
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:14+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: dialog.src
 msgctxt ""
@@ -119,6 +119,7 @@ msgid "Link"
 msgstr "Kopanyo"
 
 #: regionsw.src
+#, fuzzy
 msgctxt ""
 "regionsw.src\n"
 "CB_FILE_TEXT\n"
@@ -272,6 +273,7 @@ msgid "Footnotes/Endnotes"
 msgstr ""
 
 #: regionsw.src
+#, fuzzy
 msgctxt ""
 "regionsw.src\n"
 "DLG_INSERT_SECTION\n"
diff --git a/source/tn/sw/source/ui/docvw.po b/source/tn/sw/source/ui/docvw.po
index 5bd4f7ffcc1..9c6a44cfbe6 100644
--- a/source/tn/sw/source/ui/docvw.po
+++ b/source/tn/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:42+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: access.src
 msgctxt ""
@@ -346,6 +346,7 @@ msgid "As Link"
 msgstr ""
 
 #: docvw.src
+#, fuzzy
 msgctxt ""
 "docvw.src\n"
 "MN_READONLY_POPUP.MN_READONLY_GRAPHICTOGALLERY\n"
@@ -390,6 +391,7 @@ msgid "As Link"
 msgstr ""
 
 #: docvw.src
+#, fuzzy
 msgctxt ""
 "docvw.src\n"
 "MN_READONLY_POPUP.MN_READONLY_BACKGROUNDTOGALLERY\n"
@@ -470,6 +472,7 @@ msgid "Leave Full-Screen Mode"
 msgstr "Tlogela Tletse Sebontshi Mokgwa"
 
 #: docvw.src
+#, fuzzy
 msgctxt ""
 "docvw.src\n"
 "MN_READONLY_POPUP\n"
diff --git a/source/tn/sw/source/ui/frmdlg.po b/source/tn/sw/source/ui/frmdlg.po
index a8afdc9f75b..b5e647005af 100644
--- a/source/tn/sw/source/ui/frmdlg.po
+++ b/source/tn/sw/source/ui/frmdlg.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/frmdlg
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:14+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: frmpage.src
 msgctxt ""
@@ -282,6 +282,7 @@ msgid "Relat~ive"
 msgstr "Le~sika"
 
 #: frmpage.src
+#, fuzzy
 msgctxt ""
 "frmpage.src\n"
 "TP_FRM_STD\n"
diff --git a/source/tn/sw/source/ui/ribbar.po b/source/tn/sw/source/ui/ribbar.po
index 919fa83ebae..f86d2085341 100644
--- a/source/tn/sw/source/ui/ribbar.po
+++ b/source/tn/sw/source/ui/ribbar.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/ribbar
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 04:02+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: inputwin.src
 msgctxt ""
@@ -464,6 +464,7 @@ msgid "Text Frame"
 msgstr "Kago Kageletso"
 
 #: workctrl.src
+#, fuzzy
 msgctxt ""
 "workctrl.src\n"
 "RID_SCROLL_NAVIGATION_WIN\n"
diff --git a/source/tn/sw/source/ui/utlui.po b/source/tn/sw/source/ui/utlui.po
index 0dd9fdf8f76..672b0a929b9 100644
--- a/source/tn/sw/source/ui/utlui.po
+++ b/source/tn/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:33+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029191.0\n"
 
 #: attrdesc.src
@@ -951,6 +951,7 @@ msgid "Keywords"
 msgstr "Mafokotseno"
 
 #: initui.src
+#, fuzzy
 msgctxt ""
 "initui.src\n"
 "RID_SW_SHELLRES\n"
@@ -1320,6 +1321,7 @@ msgid "Month"
 msgstr "Kgwedi"
 
 #: initui.src
+#, fuzzy
 msgctxt ""
 "initui.src\n"
 "STR_AUTH_FIELD_NOTE\n"
@@ -3844,6 +3846,7 @@ msgid "Draw objects"
 msgstr "Thala didiriswa"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_POSTIT\n"
@@ -4004,6 +4007,7 @@ msgid "Index"
 msgstr "~Tshupetso"
 
 #: utlui.src
+#, fuzzy
 msgctxt ""
 "utlui.src\n"
 "STR_CONTENT_TYPE_SINGLE_POSTIT\n"
diff --git a/source/tn/sw/uiconfig/swriter/ui.po b/source/tn/sw/uiconfig/swriter/ui.po
index dcc341313fa..1222e14c8a1 100644
--- a/source/tn/sw/uiconfig/swriter/ui.po
+++ b/source/tn/sw/uiconfig/swriter/ui.po
@@ -1,4 +1,4 @@
-#. extracted from sw/uiconfig/swriter/ui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: LibO 40l10n\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:33+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: none\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029191.0\n"
 
 #: abstractdialog.ui
@@ -2601,6 +2601,7 @@ msgid "Insert Footnote/Endnote"
 msgstr ""
 
 #: insertfootnote.ui
+#, fuzzy
 msgctxt ""
 "insertfootnote.ui\n"
 "automatic\n"
@@ -4611,6 +4612,7 @@ msgid "Table Format"
 msgstr "Tafole Kago"
 
 #: tableproperties.ui
+#, fuzzy
 msgctxt ""
 "tableproperties.ui\n"
 "table\n"