Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

5 files changed, 86 insertions, 15 deletions

diff --git a/source/tn/cui/source/customize.po b/source/tn/cui/source/customize.po
index f8dfb72cb2b..2eab54a1a7d 100644
--- a/source/tn/cui/source/customize.po
+++ b/source/tn/cui/source/customize.po
@@ -1,4 +1,4 @@
-#. extracted from cui/source/customize
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:09+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"
 
 #: acccfg.src
 msgctxt ""
@@ -47,6 +47,7 @@ msgid "~Delete"
 msgstr "~Phimola"
 
 #: acccfg.src
+#, fuzzy
 msgctxt ""
 "acccfg.src\n"
 "PUSHBUTTON_TEXT_CHANGE\n"
@@ -59,6 +60,7 @@ msgstr ""
 "~Baakanya"
 
 #: acccfg.src
+#, fuzzy
 msgctxt ""
 "acccfg.src\n"
 "PUSHBUTTON_TEXT_NEW\n"
@@ -161,6 +163,7 @@ msgid "BASIC Macros"
 msgstr ""
 
 #: acccfg.src
+#, fuzzy
 msgctxt ""
 "acccfg.src\n"
 "RID_SVXPAGE_CONFIGGROUPBOX\n"
@@ -324,6 +327,7 @@ msgid "New..."
 msgstr "E nthsa..."
 
 #: cfg.src
+#, fuzzy
 msgctxt ""
 "cfg.src\n"
 "RID_SVXPAGE_MENUS\n"
@@ -888,6 +892,7 @@ msgid "Close Application"
 msgstr "Tswala Kopo"
 
 #: macropg.src
+#, fuzzy
 msgctxt ""
 "macropg.src\n"
 "RID_SVXSTR_EVENT_NEWDOC\n"
diff --git a/source/tn/cui/source/dialogs.po b/source/tn/cui/source/dialogs.po
index 844d90750d7..b0aff002646 100644
--- a/source/tn/cui/source/dialogs.po
+++ b/source/tn/cui/source/dialogs.po
@@ -1,4 +1,4 @@
-#. extracted from cui/source/dialogs
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-06-13 11:39+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"
 
 #: colorpicker.src
 msgctxt ""
@@ -185,6 +185,7 @@ msgid "~Suggestions"
 msgstr ""
 
 #: commonlingui.src
+#, fuzzy
 msgctxt ""
 "commonlingui.src\n"
 "RID_SVX_WND_COMMON_LINGU\n"
@@ -320,6 +321,7 @@ msgid "My Macros"
 msgstr "Dikgolo"
 
 #: cuires.src
+#, fuzzy
 msgctxt ""
 "cuires.src\n"
 "RID_SVXSTR_PRODMACROS\n"
@@ -366,6 +368,7 @@ msgid "Insert Columns"
 msgstr "~Tenya ikholomo"
 
 #: cuires.src
+#, fuzzy
 msgctxt ""
 "cuires.src\n"
 "RID_SVXSTR_AUTO_ENTRY\n"
@@ -935,6 +938,7 @@ msgid "File"
 msgstr "~Faele"
 
 #: gallery.src
+#, fuzzy
 msgctxt ""
 "gallery.src\n"
 "RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS\n"
@@ -1502,6 +1506,7 @@ msgid "Suggestions (max. 8)"
 msgstr "~Dikakany"
 
 #: hangulhanjadlg.src
+#, fuzzy
 msgctxt ""
 "hangulhanjadlg.src\n"
 "RID_SVX_MDLG_HANGULHANJA_EDIT\n"
@@ -1636,6 +1641,7 @@ msgid "~Login name"
 msgstr "~Login leina"
 
 #: hyperdlg.src
+#, fuzzy
 msgctxt ""
 "hyperdlg.src\n"
 "RID_SVXPAGE_HYPERLINK_INTERNET\n"
@@ -2358,6 +2364,7 @@ msgid "This is where you create a hyperlink to an existing document or a target
 msgstr ""
 
 #: hyperdlg.src
+#, fuzzy
 msgctxt ""
 "hyperdlg.src\n"
 "RID_SVXSTR_HYPERDLG_HLDOCNTP\n"
@@ -2909,6 +2916,7 @@ msgid "Font Effects"
 msgstr "Mokwalo Ditlamorago"
 
 #: sdrcelldlg.src
+#, fuzzy
 msgctxt ""
 "sdrcelldlg.src\n"
 "RID_SVX_FORMAT_CELLS_DLG.1\n"
@@ -3018,6 +3026,7 @@ msgid "Asian Layout"
 msgstr "Ya Asia Thulaganyo"
 
 #: srchxtra.src
+#, fuzzy
 msgctxt ""
 "srchxtra.src\n"
 "RID_SVXDLG_SEARCHFORMAT.1\n"
@@ -3031,6 +3040,7 @@ msgstr ""
 "Dikagolo le dipulophatlha"
 
 #: srchxtra.src
+#, fuzzy
 msgctxt ""
 "srchxtra.src\n"
 "RID_SVXDLG_SEARCHFORMAT.1\n"
@@ -3067,6 +3077,7 @@ msgid "Text Flow"
 msgstr "Kago Elela"
 
 #: srchxtra.src
+#, fuzzy
 msgctxt ""
 "srchxtra.src\n"
 "RID_SVXDLG_SEARCHFORMAT.1\n"
@@ -3194,6 +3205,7 @@ msgid "Type"
 msgstr "Thaepa"
 
 #: svuidlg.src
+#, fuzzy
 msgctxt ""
 "svuidlg.src\n"
 "MD_UPDATE_BASELINKS\n"
@@ -3293,6 +3305,7 @@ msgid "Update:"
 msgstr "Baakanya:"
 
 #: svuidlg.src
+#, fuzzy
 msgctxt ""
 "svuidlg.src\n"
 "MD_UPDATE_BASELINKS\n"
@@ -3323,6 +3336,7 @@ msgid "Ma~nual"
 msgstr "Ti~ro"
 
 #: svuidlg.src
+#, fuzzy
 msgctxt ""
 "svuidlg.src\n"
 "MD_UPDATE_BASELINKS\n"
diff --git a/source/tn/cui/source/options.po b/source/tn/cui/source/options.po
index e7a213261ca..66439df0746 100644
--- a/source/tn/cui/source/options.po
+++ b/source/tn/cui/source/options.po
@@ -1,4 +1,4 @@
-#. extracted from cui/source/options
+# 
 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: 1366029134.0\n"
 
 #: certpath.src
@@ -168,6 +168,7 @@ msgid "Timeout"
 msgstr "Nako e fedile"
 
 #: connpooloptions.src
+#, fuzzy
 msgctxt ""
 "connpooloptions.src\n"
 "RID_OFAPAGE_CONNPOOLOPTIONS\n"
@@ -190,6 +191,7 @@ msgstr ""
 "Eya"
 
 #: connpooloptions.src
+#, fuzzy
 msgctxt ""
 "connpooloptions.src\n"
 "RID_OFAPAGE_CONNPOOLOPTIONS\n"
@@ -1256,6 +1258,7 @@ msgid "Ignore ~font settings"
 msgstr "Ikgatholose ~mokwalo dipeo"
 
 #: opthtml.src
+#, fuzzy
 msgctxt ""
 "opthtml.src\n"
 "RID_OFAPAGE_HTMLOPT\n"
@@ -1295,6 +1298,7 @@ msgid "~Copy local graphics to Internet"
 msgstr "~Kopisa boagisanyi dikwalo go Intrenet"
 
 #: opthtml.src
+#, fuzzy
 msgctxt ""
 "opthtml.src\n"
 "FT_CHARSET\n"
@@ -1411,6 +1415,7 @@ msgid "~Add Archive..."
 msgstr "Tlhakanya Lefelo..."
 
 #: optjava.src
+#, fuzzy
 msgctxt ""
 "optjava.src\n"
 "RID_SVXDLG_JAVA_CLASSPATH\n"
@@ -2053,6 +2058,7 @@ msgid "Configuration"
 msgstr "Phetolelo"
 
 #: optpath.src
+#, fuzzy
 msgctxt ""
 "optpath.src\n"
 "RID_SVXSTR_KEY_WORK_PATH\n"
@@ -2065,6 +2071,7 @@ msgstr ""
 "Ditlankana tsa me"
 
 #: optpath.src
+#, fuzzy
 msgctxt ""
 "optpath.src\n"
 "RID_SVXSTR_KEY_GRAPHICS_PATH\n"
@@ -2119,6 +2126,7 @@ msgid "Modules"
 msgstr "Mekgwa"
 
 #: optpath.src
+#, fuzzy
 msgctxt ""
 "optpath.src\n"
 "RID_SVXSTR_KEY_TEMPLATE_PATH\n"
@@ -2157,6 +2165,7 @@ msgid "Help"
 msgstr "Thuso"
 
 #: optpath.src
+#, fuzzy
 msgctxt ""
 "optpath.src\n"
 "RID_SVXSTR_KEY_GALLERY_DIR\n"
@@ -2203,6 +2212,7 @@ msgid "Folder Bookmarks"
 msgstr "Foldara Dibukatshwao"
 
 #: optpath.src
+#, fuzzy
 msgctxt ""
 "optpath.src\n"
 "RID_SVXSTR_KEY_FILTER_PATH\n"
@@ -2239,6 +2249,7 @@ msgid "User-defined dictionaries"
 msgstr "Diditionary tsa modirsi tse di tlhalositsweng"
 
 #: optpath.src
+#, fuzzy
 msgctxt ""
 "optpath.src\n"
 "RID_SVXSTR_KEY_AUTOCORRECT_DIR\n"
@@ -2519,6 +2530,7 @@ msgid "Proxy"
 msgstr ""
 
 #: treeopt.src
+#, fuzzy
 msgctxt ""
 "treeopt.src\n"
 "RID_OFADLG_OPTIONS_TREE_PAGES.SID_INET_DLG\n"
@@ -2736,6 +2748,7 @@ msgid "Table"
 msgstr "Ditafole"
 
 #: treeopt.src
+#, fuzzy
 msgctxt ""
 "treeopt.src\n"
 "RID_OFADLG_OPTIONS_TREE_PAGES.SID_SW_ONLINEOPTIONS\n"
@@ -2753,6 +2766,7 @@ msgstr ""
 "Lemorago"
 
 #: treeopt.src
+#, fuzzy
 msgctxt ""
 "treeopt.src\n"
 "RID_OFADLG_OPTIONS_TREE_PAGES.SID_SM_EDITOPTIONS\n"
@@ -2775,6 +2789,7 @@ msgid "Settings"
 msgstr "Dipeo:"
 
 #: treeopt.src
+#, fuzzy
 msgctxt ""
 "treeopt.src\n"
 "RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS\n"
diff --git a/source/tn/cui/source/tabpages.po b/source/tn/cui/source/tabpages.po
index 98dd46b1b03..da05403730b 100644
--- a/source/tn/cui/source/tabpages.po
+++ b/source/tn/cui/source/tabpages.po
@@ -1,4 +1,4 @@
-#. extracted from cui/source/tabpages
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-06-13 11:39+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"
 
 #: autocdlg.src
 msgctxt ""
@@ -87,6 +87,7 @@ msgid "Correct accidental use of cAPS LOCK key"
 msgstr ""
 
 #: autocdlg.src
+#, fuzzy
 msgctxt ""
 "autocdlg.src\n"
 "RID_OFAPAGE_AUTOCORR_OPTIONS\n"
@@ -302,6 +303,7 @@ msgid "Single quotes"
 msgstr "Bongwe dinopolo"
 
 #: autocdlg.src
+#, fuzzy
 msgctxt ""
 "autocdlg.src\n"
 "RID_OFAPAGE_AUTOCORR_QUOTE\n"
@@ -589,6 +591,7 @@ msgid "Currently installed smart tags"
 msgstr ""
 
 #: autocdlg.src
+#, fuzzy
 msgctxt ""
 "autocdlg.src\n"
 "RID_OFAPAGE_SMARTTAG_OPTIONS\n"
@@ -864,6 +867,7 @@ msgid "~End vertical"
 msgstr "~Bofelo tsamaisomolema"
 
 #: connect.src
+#, fuzzy
 msgctxt ""
 "connect.src\n"
 "RID_SVXPAGE_CONNECTION\n"
@@ -887,6 +891,7 @@ msgstr ""
 "Bonagape"
 
 #: connect.src
+#, fuzzy
 msgctxt ""
 "connect.src\n"
 "RID_SVXPAGE_CONNECTION\n"
@@ -1071,6 +1076,7 @@ msgid "Left-to-right (vertical)"
 msgstr "Molema-go-moja (tsamaisomolema)"
 
 #: grfpage.src
+#, fuzzy
 msgctxt ""
 "grfpage.src\n"
 "RID_SVXPAGE_GRFCROP\n"
@@ -1194,6 +1200,7 @@ msgid "H~eight"
 msgstr "~Bogodimo"
 
 #: grfpage.src
+#, fuzzy
 msgctxt ""
 "grfpage.src\n"
 "RID_SVXPAGE_GRFCROP\n"
@@ -1751,6 +1758,7 @@ msgid "Long Bond"
 msgstr ""
 
 #: page.src
+#, fuzzy
 msgctxt ""
 "page.src\n"
 "RID_SVXSTRARY_PAPERSIZE_STD\n"
@@ -2091,6 +2099,7 @@ msgid "Long Bond"
 msgstr ""
 
 #: page.src
+#, fuzzy
 msgctxt ""
 "page.src\n"
 "RID_SVXSTRARY_PAPERSIZE_DRAW\n"
@@ -2431,6 +2440,7 @@ msgid "Leading"
 msgstr "Etelapele"
 
 #: paragrph.src
+#, fuzzy
 msgctxt ""
 "paragrph.src\n"
 "RID_SVXPAGE_STD_PARAGRAPH\n"
@@ -2677,6 +2687,7 @@ msgid "Bottom"
 msgstr "Tlase:"
 
 #: paragrph.src
+#, fuzzy
 msgctxt ""
 "paragrph.src\n"
 "RID_SVXPAGE_ALIGN_PARAGRAPH\n"
@@ -2717,6 +2728,7 @@ msgid "Example"
 msgstr "Sekai"
 
 #: paragrph.src
+#, fuzzy
 msgctxt ""
 "paragrph.src\n"
 "STR_PAGE_STYLE\n"
@@ -2967,6 +2979,7 @@ msgstr ""
 "A o rata go boloka marumoditlogo jaanong?"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_SVXSTR_CHARNAME_TRANSPARENT\n"
@@ -3234,6 +3247,7 @@ msgid "Transparency mode"
 msgstr "Ponagalo mokgwa"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_TRANSPARENCE\n"
@@ -3247,6 +3261,7 @@ msgstr ""
 "~Ga go na ponagala"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_TRANSPARENCE\n"
@@ -3395,6 +3410,7 @@ msgid "~End value"
 msgstr "~Fetsa boleng"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_TRANSPARENCE\n"
@@ -3497,6 +3513,7 @@ msgid "Size"
 msgstr "Bogolo:"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_AREA\n"
@@ -3619,6 +3636,7 @@ msgid "Area"
 msgstr "L~efelo"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_SHADOW\n"
@@ -3670,6 +3688,7 @@ msgid "~Color"
 msgstr "Mma~la"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_SHADOW\n"
@@ -3691,6 +3710,7 @@ msgid "Shadow"
 msgstr "Moriti"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_HATCH\n"
@@ -3840,6 +3860,7 @@ msgid "Hatching"
 msgstr "Thubo"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_BITMAP\n"
@@ -3909,6 +3930,7 @@ msgid "~Modify..."
 msgstr "~Baakanya..."
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_BITMAP\n"
@@ -3984,6 +4006,7 @@ msgid "Shadow"
 msgstr "Moriti"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXDLG_AREA.1\n"
@@ -4058,6 +4081,7 @@ msgid "Line properties"
 msgstr "Mola didiriswa"
 
 #: tabline.src
+#, fuzzy
 msgctxt ""
 "tabline.src\n"
 "RID_SVXPAGE_LINE\n"
@@ -4089,6 +4113,7 @@ msgid "~Width"
 msgstr "~Bophara"
 
 #: tabline.src
+#, fuzzy
 msgctxt ""
 "tabline.src\n"
 "RID_SVXPAGE_LINE\n"
@@ -4192,6 +4217,7 @@ msgid "- none -"
 msgstr "- sepe -"
 
 #: tabline.src
+#, fuzzy
 msgctxt ""
 "tabline.src\n"
 "RID_SVXPAGE_LINE.LB_EDGE_STYLE\n"
@@ -4411,6 +4437,7 @@ msgid "Lines"
 msgstr "Kopanyo"
 
 #: tabline.src
+#, fuzzy
 msgctxt ""
 "tabline.src\n"
 "RID_SVXPAGE_LINE_DEF\n"
@@ -4837,6 +4864,7 @@ msgid "N~one"
 msgstr "~Sepe"
 
 #: tabstpge.src
+#, fuzzy
 msgctxt ""
 "tabstpge.src\n"
 "RID_SVXPAGE_TABULATOR\n"
@@ -4899,6 +4927,7 @@ msgid "Righ~t/Bottom"
 msgstr ""
 
 #: tabstpge.src
+#, fuzzy
 msgctxt ""
 "tabstpge.src\n"
 "RID_SVXPAGE_TABULATOR\n"
@@ -5032,6 +5061,7 @@ msgid "To Bottom"
 msgstr "Go Tlase"
 
 #: textanim.src
+#, fuzzy
 msgctxt ""
 "textanim.src\n"
 "RID_SVXPAGE_TEXTANIMATION\n"
@@ -5154,6 +5184,7 @@ msgid "Text"
 msgstr "Kago"
 
 #: textanim.src
+#, fuzzy
 msgctxt ""
 "textanim.src\n"
 "RID_SVXDLG_TEXT.1\n"
diff --git a/source/tn/cui/uiconfig/ui.po b/source/tn/cui/uiconfig/ui.po
index 12d5f337eab..f4aee439ebd 100644
--- a/source/tn/cui/uiconfig/ui.po
+++ b/source/tn/cui/uiconfig/ui.po
@@ -1,4 +1,4 @@
-#. extracted from cui/uiconfig/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"
 
 #: aboutdialog.ui
 msgctxt ""
@@ -393,6 +393,7 @@ msgid "Row"
 msgstr "Mola"
 
 #: backgroundpage.ui
+#, fuzzy
 msgctxt ""
 "backgroundpage.ui\n"
 "tablelb\n"
@@ -802,6 +803,7 @@ msgid "Vertically s_tacked"
 msgstr ""
 
 #: cellalignment.ui
+#, fuzzy
 msgctxt ""
 "cellalignment.ui\n"
 "checkAsianMode\n"
@@ -2113,6 +2115,7 @@ msgid "_Save In"
 msgstr ""
 
 #: customize.ui
+#, fuzzy
 msgctxt ""
 "customize.ui\n"
 "label5\n"
@@ -3561,6 +3564,7 @@ msgid "Category"
 msgstr "Mo~futa"
 
 #: macroselectordialog.ui
+#, fuzzy
 msgctxt ""
 "macroselectordialog.ui\n"
 "macronameft\n"
@@ -7759,6 +7763,7 @@ msgid "Run"
 msgstr "Siana"
 
 #: scriptorganizer.ui
+#, fuzzy
 msgctxt ""
 "scriptorganizer.ui\n"
 "create\n"
@@ -8006,6 +8011,7 @@ msgid "_Not in dictionary"
 msgstr "_Ntlha sesupetsi"
 
 #: spellingdialog.ui
+#, fuzzy
 msgctxt ""
 "spellingdialog.ui\n"
 "ignore\n"