Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

4 files changed, 71 insertions, 12 deletions

diff --git a/source/ss/cui/source/customize.po b/source/ss/cui/source/customize.po
index fc98529eba8..9c91f24108c 100644
--- a/source/ss/cui/source/customize.po
+++ b/source/ss/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:06+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ss\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ss\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: acccfg.src
 msgctxt ""
@@ -55,6 +55,7 @@ msgid "~Modify"
 msgstr "~Lungisa"
 
 #: acccfg.src
+#, fuzzy
 msgctxt ""
 "acccfg.src\n"
 "PUSHBUTTON_TEXT_NEW\n"
@@ -99,6 +100,7 @@ msgid "Function"
 msgstr "Umsebenti"
 
 #: acccfg.src
+#, fuzzy
 msgctxt ""
 "acccfg.src\n"
 "GROUPBOX_TEXT_FUNCTIONS\n"
@@ -238,6 +240,7 @@ msgid "Begin a Group"
 msgstr "Cala licembu"
 
 #: cfg.src
+#, fuzzy
 msgctxt ""
 "cfg.src\n"
 "TEXT_RENAME\n"
diff --git a/source/ss/cui/source/dialogs.po b/source/ss/cui/source/dialogs.po
index 2959770033b..8c97449c584 100644
--- a/source/ss/cui/source/dialogs.po
+++ b/source/ss/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:29+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ss\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ss\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: colorpicker.src
 msgctxt ""
@@ -221,6 +221,7 @@ msgid "Always R~eplace"
 msgstr "Ubohlala uf~aka esikhundleni"
 
 #: commonlingui.src
+#, fuzzy
 msgctxt ""
 "commonlingui.src\n"
 "RID_SVX_WND_COMMON_LINGU\n"
@@ -477,6 +478,7 @@ msgid "Apply field format"
 msgstr "Sebentisa ifomethi yensimi"
 
 #: fmsearch.src
+#, fuzzy
 msgctxt ""
 "fmsearch.src\n"
 "RID_SVXDLG_SEARCHFORM\n"
@@ -607,6 +609,7 @@ msgid "~Close"
 msgstr "Va~la"
 
 #: fmsearch.src
+#, fuzzy
 msgctxt ""
 "fmsearch.src\n"
 "RID_SVXDLG_SEARCHFORM\n"
@@ -668,6 +671,7 @@ msgid "entire field"
 msgstr ""
 
 #: fmsearch.src
+#, fuzzy
 msgctxt ""
 "fmsearch.src\n"
 "RID_STR_FROM_TOP\n"
@@ -680,6 +684,7 @@ msgstr ""
 "Kusukela etulu"
 
 #: fmsearch.src
+#, fuzzy
 msgctxt ""
 "fmsearch.src\n"
 "RID_STR_FROM_BOTTOM\n"
@@ -802,6 +807,7 @@ msgid "Contents:"
 msgstr "Lokucuketfwe:"
 
 #: gallery.src
+#, fuzzy
 msgctxt ""
 "gallery.src\n"
 "RID_SVXTABPAGE_GALLERY_GENERAL\n"
@@ -853,6 +859,7 @@ msgid "A~dd All"
 msgstr "Y~engeta konkhe"
 
 #: gallery.src
+#, fuzzy
 msgctxt ""
 "gallery.src\n"
 "RID_SVXTABPAGE_GALLERYTHEME_FILES\n"
@@ -919,6 +926,7 @@ msgid "File type"
 msgstr "~Inhlobo yelifayela"
 
 #: gallery.src
+#, fuzzy
 msgctxt ""
 "gallery.src\n"
 "RID_SVXDLG_GALLERY_SEARCH_PROGRESS\n"
@@ -1231,6 +1239,7 @@ msgid "Smooth"
 msgstr "Busheleleti"
 
 #: hangulhanjadlg.src
+#, fuzzy
 msgctxt ""
 "hangulhanjadlg.src\n"
 "RID_SVX_MDLG_HANGULHANJA\n"
@@ -1250,6 +1259,7 @@ msgstr ""
 "~Funa"
 
 #: hangulhanjadlg.src
+#, fuzzy
 msgctxt ""
 "hangulhanjadlg.src\n"
 "RID_SVX_MDLG_HANGULHANJA\n"
@@ -1390,6 +1400,7 @@ msgid "Hanja"
 msgstr "Sihanja"
 
 #: hangulhanjadlg.src
+#, fuzzy
 msgctxt ""
 "hangulhanjadlg.src\n"
 "RID_SVX_MDLG_HANGULHANJA\n"
@@ -1526,6 +1537,7 @@ msgid "Book"
 msgstr "Incwadzi"
 
 #: hangulhanjadlg.src
+#, fuzzy
 msgctxt ""
 "hangulhanjadlg.src\n"
 "RID_SVX_MDLG_HANGULHANJA_EDIT\n"
@@ -1550,6 +1562,7 @@ msgid "Suggestions (max. 8)"
 msgstr "Tiphakamiso (tingabi ngetulu kwa 8)"
 
 #: hangulhanjadlg.src
+#, fuzzy
 msgctxt ""
 "hangulhanjadlg.src\n"
 "RID_SVX_MDLG_HANGULHANJA_EDIT\n"
@@ -2348,6 +2361,7 @@ msgid "Please type in a valid file name."
 msgstr "Uyacelwa uthayiphe libito lelisebentako lelifayela."
 
 #: hyperdlg.src
+#, fuzzy
 msgctxt ""
 "hyperdlg.src\n"
 "RID_SVXSTR_HYPERDLG_HLINETTP\n"
@@ -2432,6 +2446,7 @@ msgid "Text"
 msgstr "Umbhalo"
 
 #: hyperdlg.src
+#, fuzzy
 msgctxt ""
 "hyperdlg.src\n"
 "RID_SVXSTR_HYPERDLG_QUERYOVERWRITE\n"
@@ -2470,6 +2485,7 @@ msgid "Mark the default path for new files."
 msgstr ""
 
 #: multipat.src
+#, fuzzy
 msgctxt ""
 "multipat.src\n"
 "RID_SVXDLG_MULTIPATH\n"
@@ -3043,6 +3059,7 @@ msgid "Asian Layout"
 msgstr "Kumiswa kwase-Asia"
 
 #: srchxtra.src
+#, fuzzy
 msgctxt ""
 "srchxtra.src\n"
 "RID_SVXDLG_SEARCHFORMAT.1\n"
@@ -3067,6 +3084,7 @@ msgid "Alignment"
 msgstr "Linganisa"
 
 #: srchxtra.src
+#, fuzzy
 msgctxt ""
 "srchxtra.src\n"
 "RID_SVXDLG_SEARCHFORMAT.1\n"
@@ -3082,6 +3100,7 @@ msgstr ""
 "Kulandzelana kahle kwembhalo"
 
 #: srchxtra.src
+#, fuzzy
 msgctxt ""
 "srchxtra.src\n"
 "RID_SVXDLG_SEARCHFORMAT.1\n"
diff --git a/source/ss/cui/source/options.po b/source/ss/cui/source/options.po
index e1825640a8f..3a68a6accb9 100644
--- a/source/ss/cui/source/options.po
+++ b/source/ss/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:23+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ss\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ss\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366028621.0\n"
 
 #: certpath.src
@@ -257,6 +257,7 @@ msgid "~Database file"
 msgstr "~Lifayela ledathabhesi"
 
 #: doclinkdialog.src
+#, fuzzy
 msgctxt ""
 "doclinkdialog.src\n"
 "DLG_DOCUMENTLINK\n"
@@ -1205,6 +1206,7 @@ msgid "Font sizes"
 msgstr "Tisayizi tefonti"
 
 #: opthtml.src
+#, fuzzy
 msgctxt ""
 "opthtml.src\n"
 "RID_OFAPAGE_HTMLOPT\n"
@@ -2310,6 +2312,7 @@ msgid "Paths"
 msgstr "Indlela"
 
 #: treeopt.src
+#, fuzzy
 msgctxt ""
 "treeopt.src\n"
 "RID_OFADLG_OPTIONS_TREE_PAGES.SID_GENERAL_OPTIONS\n"
@@ -2442,6 +2445,7 @@ msgid "Complex Text Layout"
 msgstr ""
 
 #: treeopt.src
+#, fuzzy
 msgctxt ""
 "treeopt.src\n"
 "RID_OFADLG_OPTIONS_TREE_PAGES.SID_INET_DLG\n"
@@ -2464,6 +2468,7 @@ msgid "Proxy"
 msgstr ""
 
 #: treeopt.src
+#, fuzzy
 msgctxt ""
 "treeopt.src\n"
 "RID_OFADLG_OPTIONS_TREE_PAGES.SID_INET_DLG\n"
@@ -2681,6 +2686,7 @@ msgid "Table"
 msgstr "Litafula"
 
 #: treeopt.src
+#, fuzzy
 msgctxt ""
 "treeopt.src\n"
 "RID_OFADLG_OPTIONS_TREE_PAGES.SID_SW_ONLINEOPTIONS\n"
diff --git a/source/ss/cui/source/tabpages.po b/source/ss/cui/source/tabpages.po
index 251bf29bc07..b710fe33035 100644
--- a/source/ss/cui/source/tabpages.po
+++ b/source/ss/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: 2013-04-15 12:23+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ss\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ss\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366028624.0\n"
 
 #: autocdlg.src
@@ -293,6 +293,7 @@ msgid "Single quotes"
 msgstr "Ticaphuno letingasinye"
 
 #: autocdlg.src
+#, fuzzy
 msgctxt ""
 "autocdlg.src\n"
 "RID_OFAPAGE_AUTOCORR_QUOTE\n"
@@ -721,6 +722,7 @@ msgid "Set Left and Right Borders, and All Inner Lines"
 msgstr "Setha umnyele wesancele newesekudla, nawo onkhe emalayini angekhatsi"
 
 #: border.src
+#, fuzzy
 msgctxt ""
 "border.src\n"
 "RID_SVXSTR_SHADOW_STYLE_NONE\n"
@@ -855,6 +857,7 @@ msgid "~End vertical"
 msgstr "~Gcina ngekumisa"
 
 #: connect.src
+#, fuzzy
 msgctxt ""
 "connect.src\n"
 "RID_SVXPAGE_CONNECTION\n"
@@ -1006,6 +1009,7 @@ msgid "Distribution"
 msgstr "Sakata"
 
 #: frmdirlbox.src
+#, fuzzy
 msgctxt ""
 "frmdirlbox.src\n"
 "RID_SVXSTR_FRAMEDIR_LTR\n"
@@ -1018,6 +1022,7 @@ msgstr ""
 "Sancele kuye ngasekudla"
 
 #: frmdirlbox.src
+#, fuzzy
 msgctxt ""
 "frmdirlbox.src\n"
 "RID_SVXSTR_FRAMEDIR_RTL\n"
@@ -1054,6 +1059,7 @@ msgid "Right-to-left (horizontal)"
 msgstr "Sekudla nesancele (kuvundlela)"
 
 #: frmdirlbox.src
+#, fuzzy
 msgctxt ""
 "frmdirlbox.src\n"
 "RID_SVXSTR_PAGEDIR_RTL_VERT\n"
@@ -1155,6 +1161,7 @@ msgid "~Width"
 msgstr "~Bubanti"
 
 #: grfpage.src
+#, fuzzy
 msgctxt ""
 "grfpage.src\n"
 "RID_SVXPAGE_GRFCROP\n"
@@ -1186,6 +1193,7 @@ msgid "~Width"
 msgstr "~Bubanti"
 
 #: grfpage.src
+#, fuzzy
 msgctxt ""
 "grfpage.src\n"
 "RID_SVXPAGE_GRFCROP\n"
@@ -1199,6 +1207,7 @@ msgstr ""
 "~Budze"
 
 #: grfpage.src
+#, fuzzy
 msgctxt ""
 "grfpage.src\n"
 "RID_SVXPAGE_GRFCROP\n"
@@ -1293,6 +1302,7 @@ msgid "~Extension"
 msgstr "~Sandzisi"
 
 #: labdlg.src
+#, fuzzy
 msgctxt ""
 "labdlg.src\n"
 "RID_SVXPAGE_CAPTION.LB_ANSATZ\n"
@@ -1527,6 +1537,7 @@ msgid "Assign Macro"
 msgstr "Imakhro lenikwe umsebenti"
 
 #: measure.src
+#, fuzzy
 msgctxt ""
 "measure.src\n"
 "RID_SVXPAGE_MEASURE\n"
@@ -2366,6 +2377,7 @@ msgid "Leading"
 msgstr "Kuhola"
 
 #: paragrph.src
+#, fuzzy
 msgctxt ""
 "paragrph.src\n"
 "RID_SVXPAGE_STD_PARAGRAPH\n"
@@ -2379,6 +2391,7 @@ msgstr ""
 "Kufeksiwe"
 
 #: paragrph.src
+#, fuzzy
 msgctxt ""
 "paragrph.src\n"
 "RID_SVXPAGE_STD_PARAGRAPH\n"
@@ -2948,6 +2961,7 @@ msgid "~Width"
 msgstr "~Bubanti"
 
 #: swpossizetabpage.src
+#, fuzzy
 msgctxt ""
 "swpossizetabpage.src\n"
 "RID_SVXPAGE_SWPOSSIZE\n"
@@ -3123,6 +3137,7 @@ msgid "t~o"
 msgstr "k~u"
 
 #: swpossizetabpage.src
+#, fuzzy
 msgctxt ""
 "swpossizetabpage.src\n"
 "RID_SVXPAGE_SWPOSSIZE\n"
@@ -3404,6 +3419,7 @@ msgid "Size"
 msgstr "~Isayizi"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_AREA\n"
@@ -3437,6 +3453,7 @@ msgid "Wi~dth"
 msgstr "~Bubanti"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_AREA\n"
@@ -3504,6 +3521,7 @@ msgid "Offset"
 msgstr "Khipha esethini"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_AREA\n"
@@ -3517,6 +3535,7 @@ msgstr ""
 "Irow~u"
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_AREA\n"
@@ -3810,6 +3829,7 @@ msgid "~Modify..."
 msgstr "~Lungisa..."
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_BITMAP\n"
@@ -3955,6 +3975,7 @@ msgid "Line properties"
 msgstr "Timphahla telilayini"
 
 #: tabline.src
+#, fuzzy
 msgctxt ""
 "tabline.src\n"
 "RID_SVXPAGE_LINE\n"
@@ -4211,6 +4232,7 @@ msgid "Width"
 msgstr "~Bubanti"
 
 #: tabline.src
+#, fuzzy
 msgctxt ""
 "tabline.src\n"
 "RID_SVXPAGE_LINE\n"
@@ -4296,6 +4318,7 @@ msgid "End with center"
 msgstr "Ngesekudla emkhatsini"
 
 #: tabline.src
+#, fuzzy
 msgctxt ""
 "tabline.src\n"
 "RID_SVXPAGE_LINE\n"
@@ -4611,6 +4634,7 @@ msgid "Arrowheads"
 msgstr "Ema-arowhidzi"
 
 #: tabline.src
+#, fuzzy
 msgctxt ""
 "tabline.src\n"
 "RID_SVXDLG_LINE.TAB_CONTROL\n"
@@ -4659,6 +4683,7 @@ msgid "Arrow Styles"
 msgstr "Titayela tebutjoki"
 
 #: tabline.src
+#, fuzzy
 msgctxt ""
 "tabline.src\n"
 "RID_SVXDLG_LINE\n"
@@ -4760,6 +4785,7 @@ msgid "N~one"
 msgstr "~Kute"
 
 #: tabstpge.src
+#, fuzzy
 msgctxt ""
 "tabstpge.src\n"
 "RID_SVXPAGE_TABULATOR\n"
@@ -4830,6 +4856,7 @@ msgid "Righ~t/Bottom"
 msgstr "Phansi ngesekudla"
 
 #: tabstpge.src
+#, fuzzy
 msgctxt ""
 "tabstpge.src\n"
 "RID_SVXPAGE_TABULATOR\n"
@@ -4926,6 +4953,7 @@ msgid "Scroll In"
 msgstr "Dvonselekhatsi"
 
 #: textanim.src
+#, fuzzy
 msgctxt ""
 "textanim.src\n"
 "RID_SVXPAGE_TEXTANIMATION\n"
@@ -5049,6 +5077,7 @@ msgid " Pixel"
 msgstr ""
 
 #: textanim.src
+#, fuzzy
 msgctxt ""
 "textanim.src\n"
 "RID_SVXPAGE_TEXTANIMATION\n"
@@ -5097,6 +5126,7 @@ msgid "Text"
 msgstr "Umbhalo"
 
 #: textanim.src
+#, fuzzy
 msgctxt ""
 "textanim.src\n"
 "RID_SVXDLG_TEXT.1\n"
@@ -5317,6 +5347,7 @@ msgid "Wi~dth"
 msgstr "~Bubanti"
 
 #: transfrm.src
+#, fuzzy
 msgctxt ""
 "transfrm.src\n"
 "RID_SVXPAGE_POSITION_SIZE\n"