Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

4 files changed, 55 insertions, 12 deletions

diff --git a/source/ve/sc/source/core/src.po b/source/ve/sc/source/core/src.po
index 1a38b33ce0a..963e2bcb1d4 100644
--- a/source/ve/sc/source/core/src.po
+++ b/source/ve/sc/source/core/src.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/core/src
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,15 +7,16 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 04:25+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: compiler.src
+#, fuzzy
 msgctxt ""
 "compiler.src\n"
 "RID_FUNCTION_CATEGORIES\n"
@@ -98,6 +99,7 @@ msgid "Statistical"
 msgstr "Sitatisitikhaḽa"
 
 #: compiler.src
+#, fuzzy
 msgctxt ""
 "compiler.src\n"
 "RID_FUNCTION_CATEGORIES\n"
@@ -117,6 +119,7 @@ msgstr ""
 "Sipuredeshithi"
 
 #: compiler.src
+#, fuzzy
 msgctxt ""
 "compiler.src\n"
 "RID_FUNCTION_CATEGORIES\n"
diff --git a/source/ve/sc/source/ui/cctrl.po b/source/ve/sc/source/ui/cctrl.po
index 69f38b97bf3..8702b86a3a6 100644
--- a/source/ve/sc/source/ui/cctrl.po
+++ b/source/ve/sc/source/ui/cctrl.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/ui/cctrl
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 04:25+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: checklistmenu.src
 msgctxt ""
@@ -43,6 +43,7 @@ msgid "Custom Sort"
 msgstr "Fomathi ya mvelele"
 
 #: checklistmenu.src
+#, fuzzy
 msgctxt ""
 "checklistmenu.src\n"
 "RID_POPUP_FILTER\n"
diff --git a/source/ve/sc/source/ui/navipi.po b/source/ve/sc/source/ui/navipi.po
index 0ad667cf1ce..eb90056f406 100644
--- a/source/ve/sc/source/ui/navipi.po
+++ b/source/ve/sc/source/ui/navipi.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/ui/navipi
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-11-26 05:21+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: navipi.src
 msgctxt ""
@@ -88,6 +88,7 @@ msgid "End"
 msgstr "Gumani"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
 "RID_SCDLG_NAVIGATOR.TBX_CMD\n"
@@ -210,6 +211,7 @@ msgid "Navigator"
 msgstr "Sumbandila"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
 "SCSTR_CONTENT_ROOT\n"
@@ -264,6 +266,7 @@ msgid "OLE objects"
 msgstr "Zwithu zwa OLE"
 
 #: navipi.src
+#, fuzzy
 msgctxt ""
 "navipi.src\n"
 "SCSTR_CONTENT_NOTE\n"
diff --git a/source/ve/sc/source/ui/src.po b/source/ve/sc/source/ui/src.po
index c51f54a4ce6..cfcde930508 100644
--- a/source/ve/sc/source/ui/src.po
+++ b/source/ve/sc/source/ui/src.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/ui/src
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:41+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ve\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ve\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029696.0\n"
 
 #: autofmt.src
@@ -268,6 +268,7 @@ msgid "Axis"
 msgstr "A~xisi"
 
 #: colorformat.src
+#, fuzzy
 msgctxt ""
 "colorformat.src\n"
 "RID_SCDLG_DATABAR\n"
@@ -281,6 +282,7 @@ msgstr ""
 "Gumotuku"
 
 #: colorformat.src
+#, fuzzy
 msgctxt ""
 "colorformat.src\n"
 "RID_SCDLG_DATABAR\n"
@@ -330,6 +332,7 @@ msgid "Color of vertical axis"
 msgstr ""
 
 #: colorformat.src
+#, fuzzy
 msgctxt ""
 "colorformat.src\n"
 "RID_SCDLG_DATABAR.LB_TYPE\n"
@@ -353,6 +356,7 @@ msgstr ""
 "Othomathiki"
 
 #: colorformat.src
+#, fuzzy
 msgctxt ""
 "colorformat.src\n"
 "RID_SCDLG_DATABAR.LB_TYPE\n"
@@ -366,6 +370,7 @@ msgstr ""
 "Gumotuku"
 
 #: colorformat.src
+#, fuzzy
 msgctxt ""
 "colorformat.src\n"
 "RID_SCDLG_DATABAR.LB_TYPE\n"
@@ -415,6 +420,7 @@ msgid "Formula"
 msgstr "Fomuḽa"
 
 #: colorformat.src
+#, fuzzy
 msgctxt ""
 "colorformat.src\n"
 "RID_SCDLG_DATABAR.LB_AXIS_POSITION\n"
@@ -508,6 +514,7 @@ msgid "Conditional Formatting for"
 msgstr "U Fomatha ho Langeaho"
 
 #: condformatdlg.src
+#, fuzzy
 msgctxt ""
 "condformatdlg.src\n"
 "RID_COND_ENTRY\n"
@@ -829,6 +836,7 @@ msgid "New Style..."
 msgstr ""
 
 #: condformatdlg.src
+#, fuzzy
 msgctxt ""
 "condformatdlg.src\n"
 "RID_COND_ENTRY.LB_TYPE_COL_SCALE_MIN\n"
@@ -906,6 +914,7 @@ msgid "Formula"
 msgstr "Fomuḽa"
 
 #: condformatdlg.src
+#, fuzzy
 msgctxt ""
 "condformatdlg.src\n"
 "RID_COND_ENTRY.LB_TYPE_COL_SCALE_MIDDLE\n"
@@ -983,6 +992,7 @@ msgid "Formula"
 msgstr "Fomuḽa"
 
 #: condformatdlg.src
+#, fuzzy
 msgctxt ""
 "condformatdlg.src\n"
 "RID_COND_ENTRY.LB_TYPE_COL_SCALE_MAX\n"
@@ -1411,6 +1421,7 @@ msgid "Remove"
 msgstr "Bvisani"
 
 #: condformatmgr.src
+#, fuzzy
 msgctxt ""
 "condformatmgr.src\n"
 "RID_SCDLG_COND_FORMAT_MANAGER\n"
@@ -1673,6 +1684,7 @@ msgid "Field name"
 msgstr "Dzina ḽa Buḓo"
 
 #: filter.src
+#, fuzzy
 msgctxt ""
 "filter.src\n"
 "RID_SCDLG_FILTER\n"
@@ -2577,6 +2589,7 @@ msgid "Field name"
 msgstr "Dzina ḽa Buḓo"
 
 #: filter.src
+#, fuzzy
 msgctxt ""
 "filter.src\n"
 "RID_SCDLG_PIVOTFILTER\n"
@@ -2894,6 +2907,7 @@ msgid "Field Name"
 msgstr "Dzina ḽa Buḓo"
 
 #: filter.src
+#, fuzzy
 msgctxt ""
 "filter.src\n"
 "RID_FILTER_CONDITION\n"
@@ -6528,6 +6542,7 @@ msgid "Manual"
 msgstr "Manyuala"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6680,6 +6695,7 @@ msgid "AutoShape"
 msgstr ""
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6693,6 +6709,7 @@ msgstr ""
 "Rekhithengele"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6737,6 +6754,7 @@ msgid "Button"
 msgstr "Gunubu"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6772,6 +6790,7 @@ msgid "Label"
 msgstr "Ḽebuḽu"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6834,6 +6853,7 @@ msgid "Cell Styles"
 msgstr "Zwitaela zwa sele"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -7552,6 +7572,7 @@ msgid "Cu~t"
 msgstr "Gerani"
 
 #: hdrcont.src
+#, fuzzy
 msgctxt ""
 "hdrcont.src\n"
 "PART2\n"
@@ -7880,6 +7901,7 @@ msgid "~Add"
 msgstr "~Engedzani"
 
 #: miscdlgs.src
+#, fuzzy
 msgctxt ""
 "miscdlgs.src\n"
 "RID_SCDLG_INSCONT\n"
@@ -8000,6 +8022,7 @@ msgid "Paste Special"
 msgstr "Nambatedzani Tshipeshala"
 
 #: miscdlgs.src
+#, fuzzy
 msgctxt ""
 "miscdlgs.src\n"
 "RID_SCDLG_MOVETAB\n"
@@ -8026,6 +8049,7 @@ msgid "~Move"
 msgstr "Sudzulusani"
 
 #: miscdlgs.src
+#, fuzzy
 msgctxt ""
 "miscdlgs.src\n"
 "RID_SCDLG_MOVETAB\n"
@@ -8839,6 +8863,7 @@ msgid "Copy list ~from"
 msgstr "Kopani mutevhe ~u bva kha"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "RID_SCPAGE_USERLISTS\n"
@@ -8870,6 +8895,7 @@ msgid "~Delete"
 msgstr "Yo thuthiwa"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "RID_SCPAGE_USERLISTS\n"
@@ -9526,6 +9552,7 @@ msgid "~Suppress output of empty pages"
 msgstr "~Pwanyeledzani mvelelo dza masiaṱari a si na tshithu"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "RID_SCPAGE_PRINT\n"
@@ -9787,6 +9814,7 @@ msgid "Cu~t"
 msgstr "Gerani"
 
 #: popup.src
+#, fuzzy
 msgctxt ""
 "popup.src\n"
 "RID_POPUP_CELLS\n"
@@ -13130,6 +13158,7 @@ msgid "Salvage: The remaining value of the asset at the end of its life."
 msgstr ""
 
 #: scfuncs.src
+#, fuzzy
 msgctxt ""
 "scfuncs.src\n"
 "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_DIA\n"
@@ -13219,6 +13248,7 @@ msgid "Salvage: The remaining value of the asset at the end of its life."
 msgstr ""
 
 #: scfuncs.src
+#, fuzzy
 msgctxt ""
 "scfuncs.src\n"
 "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_LIA\n"
@@ -13290,6 +13320,7 @@ msgid "Salvage: The remaining value of the asset at the end of its life."
 msgstr ""
 
 #: scfuncs.src
+#, fuzzy
 msgctxt ""
 "scfuncs.src\n"
 "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GDA\n"
@@ -13397,6 +13428,7 @@ msgid "Salvage: The remaining value of the asset at the end of its life."
 msgstr ""
 
 #: scfuncs.src
+#, fuzzy
 msgctxt ""
 "scfuncs.src\n"
 "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GDA_2\n"
@@ -13504,6 +13536,7 @@ msgid "Salvage. The salvage value of an asset at the end of its useful life."
 msgstr "Wanulusa. Ndeme yo waluswaho ya ndaka mafhedziseloni a vhutshilo hayo vhure na mushumo."
 
 #: scfuncs.src
+#, fuzzy
 msgctxt ""
 "scfuncs.src\n"
 "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_VBD\n"
@@ -24478,6 +24511,7 @@ msgid "Row %1"
 msgstr ""
 
 #: scstring.src
+#, fuzzy
 msgctxt ""
 "scstring.src\n"
 "SCSTR_NEW\n"
@@ -25057,6 +25091,7 @@ msgid ""
 msgstr ""
 
 #: scstring.src
+#, fuzzy
 msgctxt ""
 "scstring.src\n"
 "SCSTR_ALLFILTER\n"
@@ -25519,6 +25554,7 @@ msgid "Settings:"
 msgstr "Nzudzanyo:"
 
 #: solveroptions.src
+#, fuzzy
 msgctxt ""
 "solveroptions.src\n"
 "RID_SCDLG_SOLVEROPTIONS\n"