Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

8 files changed, 62 insertions, 24 deletions

diff --git a/source/tn/svx/inc.po b/source/tn/svx/inc.po
index 03bb94a9ba3..e1a3d186e84 100644
--- a/source/tn/svx/inc.po
+++ b/source/tn/svx/inc.po
@@ -1,4 +1,4 @@
-#. extracted from svx/inc
+# 
 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"
 
 #: globlmn_tmpl.hrc
 msgctxt ""
@@ -287,6 +287,7 @@ msgid "~Top"
 msgstr "~Godimo"
 
 #: globlmn_tmpl.hrc
+#, fuzzy
 msgctxt ""
 "globlmn_tmpl.hrc\n"
 "ITEM_FORMAT_OBJECT_ALIGN_MIDDLE\n"
diff --git a/source/tn/svx/source/dialog.po b/source/tn/svx/source/dialog.po
index 9b23bd81a2a..f8da7c9a4a2 100644
--- a/source/tn/svx/source/dialog.po
+++ b/source/tn/svx/source/dialog.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/dialog
+# 
 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: 1366029180.0\n"
 
 #: bmpmask.src
@@ -455,6 +455,7 @@ msgid "~Start Recovery >"
 msgstr ""
 
 #: docrecovery.src
+#, fuzzy
 msgctxt ""
 "docrecovery.src\n"
 "RID_SVXPAGE_DOCRECOVERY_RECOVER\n"
@@ -585,6 +586,7 @@ msgid ""
 msgstr ""
 
 #: docrecovery.src
+#, fuzzy
 msgctxt ""
 "docrecovery.src\n"
 "RID_SVX_MDLG_DOCRECOVERY_BROKEN\n"
@@ -664,6 +666,7 @@ msgid "< ~Back"
 msgstr "< ~Morago"
 
 #: docrecovery.src
+#, fuzzy
 msgctxt ""
 "docrecovery.src\n"
 "RID_SVXPAGE_ERR_REP_WELCOME\n"
@@ -835,6 +838,7 @@ msgid "HT~TP Proxy"
 msgstr "HT~TP Kemedi"
 
 #: docrecovery.src
+#, fuzzy
 msgctxt ""
 "docrecovery.src\n"
 "RID_SVX_MDLG_ERR_REP_OPTIONS\n"
@@ -1706,6 +1710,7 @@ msgid "~Ask when linking a graphic"
 msgstr ""
 
 #: optgrid.src
+#, fuzzy
 msgctxt ""
 "optgrid.src\n"
 "RID_SVXPAGE_GRID\n"
@@ -1748,6 +1753,7 @@ msgid "Resolution"
 msgstr "Thara~bololo"
 
 #: optgrid.src
+#, fuzzy
 msgctxt ""
 "optgrid.src\n"
 "RID_SVXPAGE_GRID\n"
@@ -1781,6 +1787,7 @@ msgid "Subdivision"
 msgstr "Karoganyonnye"
 
 #: optgrid.src
+#, fuzzy
 msgctxt ""
 "optgrid.src\n"
 "RID_SVXPAGE_GRID\n"
@@ -2455,6 +2462,7 @@ msgid "Not centered"
 msgstr "G a e a garafatswa"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRAFMODE_STANDARD\n"
@@ -3119,6 +3127,7 @@ msgid "From the Middle, Violet"
 msgstr "Dikolo kwa gare"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT38\n"
@@ -3149,6 +3158,7 @@ msgid "Horizontal Green"
 msgstr "Tsam~aisomoja sethaledi"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT41\n"
@@ -3161,6 +3171,7 @@ msgstr ""
 "Tsamaisooja Mola"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT42\n"
@@ -3183,6 +3194,7 @@ msgid "Horizontal Turquoise"
 msgstr "Tsam~aisomoja sethaledi"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT44\n"
@@ -4118,6 +4130,7 @@ msgid "Files Found"
 msgstr "Faele ga e a bonwa: "
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GALLERY_PREVIEW\n"
@@ -4739,6 +4752,7 @@ msgid "Base line"
 msgstr "Boalodimo"
 
 #: swframeposstrings.src
+#, fuzzy
 msgctxt ""
 "swframeposstrings.src\n"
 "RID_SVXSW_FRAMEPOSITIONS\n"
diff --git a/source/tn/svx/source/form.po b/source/tn/svx/source/form.po
index 0da42bd5d52..839c8dcc349 100644
--- a/source/tn/svx/source/form.po
+++ b/source/tn/svx/source/form.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/form
+# 
 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: 1366029182.0\n"
 
 #: datanavi.src
@@ -1420,6 +1420,7 @@ msgid "Form"
 msgstr "Ditiro"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_TABWIN_PREFIX\n"
@@ -1860,6 +1861,7 @@ msgid "Navigation Bar"
 msgstr "Ketelopele bar"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_STR_PROPTITLE_MULTISELECT\n"
@@ -2308,6 +2310,7 @@ msgid "~Alignment"
 msgstr "~Thulaganyo"
 
 #: formshell.src
+#, fuzzy
 msgctxt ""
 "formshell.src\n"
 "RID_FM_TEXTATTRIBUTE_MENU\n"
@@ -2348,6 +2351,7 @@ msgid "Position"
 msgstr "Maemo"
 
 #: formshell.src
+#, fuzzy
 msgctxt ""
 "formshell.src\n"
 "RID_SVXDLG_TEXTCONTROL_CHARATTR\n"
@@ -2364,6 +2368,7 @@ msgstr ""
 "Sediragatsi"
 
 #: formshell.src
+#, fuzzy
 msgctxt ""
 "formshell.src\n"
 "RID_SVXDLG_TEXTCONTROL_PARAATTR.1\n"
@@ -2386,6 +2391,7 @@ msgid "Alignment"
 msgstr "Thulaganyo"
 
 #: formshell.src
+#, fuzzy
 msgctxt ""
 "formshell.src\n"
 "RID_SVXDLG_TEXTCONTROL_PARAATTR.1\n"
diff --git a/source/tn/svx/source/gallery2.po b/source/tn/svx/source/gallery2.po
index 3b2106ea1e3..1724a8ef74a 100644
--- a/source/tn/svx/source/gallery2.po
+++ b/source/tn/svx/source/gallery2.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/gallery2
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-12-26 11:21+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: 1356520902.0\n"
 
 #: gallery.src
@@ -190,6 +190,7 @@ msgid "Assign ID"
 msgstr "Dira ID"
 
 #: gallery.src
+#, fuzzy
 msgctxt ""
 "gallery.src\n"
 "RID_SVXSTR_GALLERY_TITLE\n"
@@ -1188,6 +1189,7 @@ msgid "Signs - danger"
 msgstr ""
 
 #: galtheme.src
+#, fuzzy
 msgctxt ""
 "galtheme.src\n"
 "RID_GALLERYSTR_THEME_OBJECTS\n"
diff --git a/source/tn/svx/source/items.po b/source/tn/svx/source/items.po
index d6e24cf60b8..f2144628539 100644
--- a/source/tn/svx/source/items.po
+++ b/source/tn/svx/source/items.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/items
+# 
 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"
 
 #: svxerr.src
 msgctxt ""
@@ -360,6 +360,7 @@ msgid "Strikethrough"
 msgstr "Tswelapele"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
@@ -501,6 +502,7 @@ msgid "Page Break"
 msgstr "Tsebe Thubo"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_ATTR_NAMES\n"
diff --git a/source/tn/svx/source/src.po b/source/tn/svx/source/src.po
index 7af9301fc86..dc2b02265e2 100644
--- a/source/tn/svx/source/src.po
+++ b/source/tn/svx/source/src.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/src
+# 
 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"
 
 #: app.src
 msgctxt ""
@@ -239,6 +239,7 @@ msgid "Action not supported"
 msgstr "Tiragalo ga e a tshegediwa"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRHDL\n"
diff --git a/source/tn/svx/source/svdraw.po b/source/tn/svx/source/svdraw.po
index a4108ab024e..d32b4afe23d 100644
--- a/source/tn/svx/source/svdraw.po
+++ b/source/tn/svx/source/svdraw.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/svdraw
+# 
 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: 1366029184.0\n"
 
 #: svdstr.src
@@ -4864,6 +4864,7 @@ msgid "Split cells"
 msgstr "Kgaoganya Disele"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_TABLE_MERGE\n"
@@ -4918,6 +4919,7 @@ msgid "Table style settings"
 msgstr ""
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNameSingulTable\n"
diff --git a/source/tn/svx/source/unodialogs/textconversiondlgs.po b/source/tn/svx/source/unodialogs/textconversiondlgs.po
index ff5e0af9a10..4a84ea5c1cf 100644
--- a/source/tn/svx/source/unodialogs/textconversiondlgs.po
+++ b/source/tn/svx/source/unodialogs/textconversiondlgs.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/unodialogs/textconversiondlgs
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-11 23:37+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"
 
 #: chinese_dialogs.src
 msgctxt ""
@@ -69,6 +69,7 @@ msgid "Property"
 msgstr "Moago"
 
 #: chinese_dialogs.src
+#, fuzzy
 msgctxt ""
 "chinese_dialogs.src\n"
 "DLG_CHINESEDICTIONARY.LB_PROPERTY\n"
@@ -109,6 +110,7 @@ msgid "Last name"
 msgstr "Leina la bofelo"
 
 #: chinese_dialogs.src
+#, fuzzy
 msgctxt ""
 "chinese_dialogs.src\n"
 "DLG_CHINESEDICTIONARY.LB_PROPERTY\n"
@@ -134,6 +136,7 @@ msgstr ""
 "Setlhogo"
 
 #: chinese_dialogs.src
+#, fuzzy
 msgctxt ""
 "chinese_dialogs.src\n"
 "DLG_CHINESEDICTIONARY.LB_PROPERTY\n"
@@ -188,6 +191,7 @@ msgid "Idiom"
 msgstr ""
 
 #: chinese_dialogs.src
+#, fuzzy
 msgctxt ""
 "chinese_dialogs.src\n"
 "DLG_CHINESEDICTIONARY.LB_PROPERTY\n"
@@ -248,6 +252,7 @@ msgid "~Add"
 msgstr "~Tlhakanya"
 
 #: chinese_dialogs.src
+#, fuzzy
 msgctxt ""
 "chinese_dialogs.src\n"
 "DLG_CHINESEDICTIONARY\n"
@@ -314,6 +319,7 @@ msgid "Property"
 msgstr "Moago"
 
 #: chinese_dictionarydialog.src
+#, fuzzy
 msgctxt ""
 "chinese_dictionarydialog.src\n"
 "DLG_CHINESEDICTIONARY.LB_PROPERTY\n"
@@ -354,6 +360,7 @@ msgid "Last name"
 msgstr "Leina la bofelo"
 
 #: chinese_dictionarydialog.src
+#, fuzzy
 msgctxt ""
 "chinese_dictionarydialog.src\n"
 "DLG_CHINESEDICTIONARY.LB_PROPERTY\n"
@@ -379,6 +386,7 @@ msgstr ""
 "Setlhogo"
 
 #: chinese_dictionarydialog.src
+#, fuzzy
 msgctxt ""
 "chinese_dictionarydialog.src\n"
 "DLG_CHINESEDICTIONARY.LB_PROPERTY\n"
@@ -433,6 +441,7 @@ msgid "Idiom"
 msgstr ""
 
 #: chinese_dictionarydialog.src
+#, fuzzy
 msgctxt ""
 "chinese_dictionarydialog.src\n"
 "DLG_CHINESEDICTIONARY.LB_PROPERTY\n"
@@ -493,6 +502,7 @@ msgid "~Add"
 msgstr "~Tlhakanya"
 
 #: chinese_dictionarydialog.src
+#, fuzzy
 msgctxt ""
 "chinese_dictionarydialog.src\n"
 "DLG_CHINESEDICTIONARY\n"