Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

6 files changed, 42 insertions, 18 deletions

diff --git a/source/tn/sc/source/core/src.po b/source/tn/sc/source/core/src.po
index 3a0bce6a727..93f44d24d15 100644
--- a/source/tn/sc/source/core/src.po
+++ b/source/tn/sc/source/core/src.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/core/src
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 03:59+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"
 
 #: compiler.src
 msgctxt ""
@@ -87,6 +87,7 @@ msgid "Statistical"
 msgstr ""
 
 #: compiler.src
+#, fuzzy
 msgctxt ""
 "compiler.src\n"
 "RID_FUNCTION_CATEGORIES\n"
diff --git a/source/tn/sc/source/ui/dbgui.po b/source/tn/sc/source/ui/dbgui.po
index 24431d2bfb1..0edb6e6b082 100644
--- a/source/tn/sc/source/ui/dbgui.po
+++ b/source/tn/sc/source/ui/dbgui.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/ui/dbgui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-12-26 11:20+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: 1356520810.0\n"
 
 #: consdlg.src
@@ -1260,6 +1260,7 @@ msgid "~Ascending"
 msgstr "~Tswaya"
 
 #: pvfundlg.src
+#, fuzzy
 msgctxt ""
 "pvfundlg.src\n"
 "RID_SCDLG_DPSUBTOTAL_OPT\n"
@@ -1381,6 +1382,7 @@ msgid "Top"
 msgstr "Godimo"
 
 #: pvfundlg.src
+#, fuzzy
 msgctxt ""
 "pvfundlg.src\n"
 "RID_SCDLG_DPSUBTOTAL_OPT.LB_SHOW_FROM\n"
diff --git a/source/tn/sc/source/ui/formdlg.po b/source/tn/sc/source/ui/formdlg.po
index bdf63087204..cca2479e263 100644
--- a/source/tn/sc/source/ui/formdlg.po
+++ b/source/tn/sc/source/ui/formdlg.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/ui/formdlg
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 03:59+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"
 
 #: dwfunctr.src
 msgctxt ""
@@ -105,6 +105,7 @@ msgid "Statistical"
 msgstr ""
 
 #: dwfunctr.src
+#, fuzzy
 msgctxt ""
 "dwfunctr.src\n"
 "FID_FUNCTION_BOX.CB_CAT\n"
diff --git a/source/tn/sc/source/ui/navipi.po b/source/tn/sc/source/ui/navipi.po
index c2d0dfdcb31..35332e241b6 100644
--- a/source/tn/sc/source/ui/navipi.po
+++ b/source/tn/sc/source/ui/navipi.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/ui/navipi
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-11-26 05:07+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"
 
 #: navipi.src
 msgctxt ""
@@ -87,6 +87,7 @@ msgid "End"
 msgstr "Fetsa"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
 "RID_SCDLG_NAVIGATOR.TBX_CMD\n"
@@ -207,6 +208,7 @@ msgid "Navigator"
 msgstr "Molaodi"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
 "SCSTR_CONTENT_ROOT\n"
@@ -259,6 +261,7 @@ msgid "OLE objects"
 msgstr "OLE didiriswa"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
 "SCSTR_CONTENT_NOTE\n"
diff --git a/source/tn/sc/source/ui/src.po b/source/tn/sc/source/ui/src.po
index 7b8a02aa6f9..1d922662ae2 100644
--- a/source/tn/sc/source/ui/src.po
+++ b/source/tn/sc/source/ui/src.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/ui/src
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:32+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: 1366029164.0\n"
 
 #: autofmt.src
@@ -6627,6 +6627,7 @@ msgid "Button"
 msgstr "Konopo"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6653,6 +6654,7 @@ msgid "Option Button"
 msgstr "Kgetho Konopo"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6675,6 +6677,7 @@ msgid "List Box"
 msgstr "Listi Lebokoso"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6726,6 +6729,7 @@ msgid "Cell Styles"
 msgstr "Sele Mokgwa"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -7444,6 +7448,7 @@ msgid "Cu~t"
 msgstr "Kgaola"
 
 #: hdrcont.src
+#, fuzzy
 msgctxt ""
 "hdrcont.src\n"
 "PART2\n"
@@ -7900,6 +7905,7 @@ msgid "~Move"
 msgstr "Tsamaisa"
 
 #: miscdlgs.src
+#, fuzzy
 msgctxt ""
 "miscdlgs.src\n"
 "RID_SCDLG_MOVETAB\n"
@@ -8199,6 +8205,7 @@ msgid "~Right"
 msgstr "Moja"
 
 #: miscdlgs.src
+#, fuzzy
 msgctxt ""
 "miscdlgs.src\n"
 "RID_SCDLG_FILLSERIES\n"
@@ -8711,6 +8718,7 @@ msgid "Copy list ~from"
 msgstr "Kopisa listi ~fomo"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "RID_SCPAGE_USERLISTS\n"
@@ -8742,6 +8750,7 @@ msgid "~Delete"
 msgstr "~Phimola"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "RID_SCPAGE_USERLISTS\n"
@@ -9652,6 +9661,7 @@ msgid "Cu~t"
 msgstr "Kgaola"
 
 #: popup.src
+#, fuzzy
 msgctxt ""
 "popup.src\n"
 "RID_POPUP_CELLS\n"
@@ -9687,6 +9697,7 @@ msgid "P~aste Special..."
 msgstr "Gatisa ~E e kgethegileng..."
 
 #: popup.src
+#, fuzzy
 msgctxt ""
 "popup.src\n"
 "RID_POPUP_CELLS.SID_PASTE_ONLY\n"
@@ -22870,6 +22881,7 @@ msgid "Replaces characters within a text string with a different text string."
 msgstr "E tlaleletsa didiragatsi mo go kago tshwaraganyo ya e e farologaneng tshwaragano."
 
 #: scfuncs.src
+#, fuzzy
 msgctxt ""
 "scfuncs.src\n"
 "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_REPLACE\n"
@@ -23548,6 +23560,7 @@ msgid "Calculates the value of a Roman numeral."
 msgstr "E bala boleng jwa SeRona palo."
 
 #: scfuncs.src
+#, fuzzy
 msgctxt ""
 "scfuncs.src\n"
 "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_ARABIC\n"
@@ -23587,6 +23600,7 @@ msgid "Returns information about the environment."
 msgstr ""
 
 #: scfuncs.src
+#, fuzzy
 msgctxt ""
 "scfuncs.src\n"
 "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_INFO\n"
@@ -24357,6 +24371,7 @@ msgid "Row %1"
 msgstr ""
 
 #: scstring.src
+#, fuzzy
 msgctxt ""
 "scstring.src\n"
 "SCSTR_NEW\n"
@@ -24907,6 +24922,7 @@ msgid "Graphics Filter"
 msgstr "Dikwalo Sekgaoganyi"
 
 #: scstring.src
+#, fuzzy
 msgctxt ""
 "scstring.src\n"
 "STR_CAPTION_DEFAULT_TEXT\n"
diff --git a/source/tn/sc/uiconfig/scalc/ui.po b/source/tn/sc/uiconfig/scalc/ui.po
index ab6cc26ac06..23d20deb4ac 100644
--- a/source/tn/sc/uiconfig/scalc/ui.po
+++ b/source/tn/sc/uiconfig/scalc/ui.po
@@ -1,4 +1,4 @@
-#. extracted from sc/uiconfig/scalc/ui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: LibO 40l10n\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-11-17 19:02+0200\n"
 "Last-Translator: Automatically generated\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"
 
 #: allheaderfooterdialog.ui
 msgctxt ""
@@ -2790,6 +2790,7 @@ msgid "Custom"
 msgstr ""
 
 #: textimportoptions.ui
+#, fuzzy
 msgctxt ""
 "textimportoptions.ui\n"
 "automatic\n"