Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

1 files changed, 30 insertions, 3 deletions

diff --git a/source/ts/chart2/source/controller/dialogs.po b/source/ts/chart2/source/controller/dialogs.po
index 268a30c25f6..b9ab68b17ba 100644
--- a/source/ts/chart2/source/controller/dialogs.po
+++ b/source/ts/chart2/source/controller/dialogs.po
@@ -1,4 +1,4 @@
-#. extracted from chart2/source/controller/dialogs
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:34+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ts\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: ts\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029262.0\n"
 
 #: Strings.src
@@ -192,6 +192,7 @@ msgid "Positioning"
 msgstr "Ku veka hi xiyimo"
 
 #: Strings.src
+#, fuzzy
 msgctxt ""
 "Strings.src\n"
 "STR_PAGE_TRENDLINE_TYPE\n"
@@ -446,6 +447,7 @@ msgid "Main Title"
 msgstr "Nhlokomhaka-nkulu"
 
 #: Strings.src
+#, fuzzy
 msgctxt ""
 "Strings.src\n"
 "STR_OBJECT_TITLE_SUB\n"
@@ -1118,6 +1120,7 @@ msgid "~Number of lines"
 msgstr "~Nhlayo ya tilayini"
 
 #: Strings_AdditionalControls.src
+#, fuzzy
 msgctxt ""
 "Strings_AdditionalControls.src\n"
 "STR_TEXT_SEPARATOR\n"
@@ -1154,6 +1157,7 @@ msgid "Stepped"
 msgstr ""
 
 #: Strings_ChartTypes.src
+#, fuzzy
 msgctxt ""
 "Strings_ChartTypes.src\n"
 "STR_TYPE_COLUMN\n"
@@ -1679,6 +1683,7 @@ msgid "Font Position"
 msgstr "Ndhawu ya tifonti"
 
 #: dlg_ShapeFont.src
+#, fuzzy
 msgctxt ""
 "dlg_ShapeFont.src\n"
 "DLG_SHAPE_FONT\n"
@@ -1703,6 +1708,7 @@ msgstr ""
 "Letere"
 
 #: dlg_ShapeParagraph.src
+#, fuzzy
 msgctxt ""
 "dlg_ShapeParagraph.src\n"
 "DLG_SHAPE_PARAGRAPH.1\n"
@@ -1745,6 +1751,7 @@ msgid "Tab"
 msgstr "Thebe"
 
 #: dlg_ShapeParagraph.src
+#, fuzzy
 msgctxt ""
 "dlg_ShapeParagraph.src\n"
 "DLG_SHAPE_PARAGRAPH\n"
@@ -1816,6 +1823,7 @@ msgid "Best fit"
 msgstr ""
 
 #: res_DataLabel_tmpl.hrc
+#, fuzzy
 msgctxt ""
 "res_DataLabel_tmpl.hrc\n"
 "WORKAROUND\n"
@@ -1831,6 +1839,7 @@ msgstr ""
 "Xikarhi"
 
 #: res_DataLabel_tmpl.hrc
+#, fuzzy
 msgctxt ""
 "res_DataLabel_tmpl.hrc\n"
 "WORKAROUND\n"
@@ -1853,6 +1862,7 @@ msgid "Top left"
 msgstr "Ehenhla eximatsini"
 
 #: res_DataLabel_tmpl.hrc
+#, fuzzy
 msgctxt ""
 "res_DataLabel_tmpl.hrc\n"
 "WORKAROUND\n"
@@ -1887,6 +1897,7 @@ msgid "Bottom left"
 msgstr "Ehansi hi le ximatsini"
 
 #: res_DataLabel_tmpl.hrc
+#, fuzzy
 msgctxt ""
 "res_DataLabel_tmpl.hrc\n"
 "WORKAROUND\n"
@@ -1911,6 +1922,7 @@ msgid "Bottom right"
 msgstr "Ehansi hi lee xineneni"
 
 #: res_DataLabel_tmpl.hrc
+#, fuzzy
 msgctxt ""
 "res_DataLabel_tmpl.hrc\n"
 "WORKAROUND\n"
@@ -2323,6 +2335,7 @@ msgid "New line"
 msgstr ""
 
 #: res_Titlesx_tmpl.hrc
+#, fuzzy
 msgctxt ""
 "res_Titlesx_tmpl.hrc\n"
 "TITLES( xpos, ypos, availableWidth, indentLabel, fixedLinesHeight )\n"
@@ -2713,6 +2726,7 @@ msgid "Stagger ~even"
 msgstr "Khatakana ~hi ku landzelelana"
 
 #: tp_AxisLabel.src
+#, fuzzy
 msgctxt ""
 "tp_AxisLabel.src\n"
 "TP_AXIS_LABEL\n"
@@ -2781,6 +2795,7 @@ msgid "End"
 msgstr "Heta"
 
 #: tp_AxisPositions.src
+#, fuzzy
 msgctxt ""
 "tp_AxisPositions.src\n"
 "TP_AXIS_POSITIONS.LB_CROSSES_OTHER_AXIS_AT\n"
@@ -2804,6 +2819,7 @@ msgstr ""
 "Ntikelo"
 
 #: tp_AxisPositions.src
+#, fuzzy
 msgctxt ""
 "tp_AxisPositions.src\n"
 "TP_AXIS_POSITIONS.LB_CROSSES_OTHER_AXIS_AT\n"
@@ -2834,6 +2850,7 @@ msgid "Axis ~between categories"
 msgstr ""
 
 #: tp_AxisPositions.src
+#, fuzzy
 msgctxt ""
 "tp_AxisPositions.src\n"
 "TP_AXIS_POSITIONS\n"
@@ -3128,6 +3145,7 @@ msgid "S~mooth lines"
 msgstr ""
 
 #: tp_ChartType.src
+#, fuzzy
 msgctxt ""
 "tp_ChartType.src\n"
 "TP_CHARTTYPE\n"
@@ -3415,6 +3433,7 @@ msgid "T~ype"
 msgstr "Ri~xaka"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE.LB_AXIS_TYPE\n"
@@ -3438,6 +3457,7 @@ msgstr ""
 "Ku endleka hi koxe"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE.LB_AXIS_TYPE\n"
@@ -3475,6 +3495,7 @@ msgstr ""
 "Marito"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE.LB_AXIS_TYPE\n"
@@ -3519,6 +3540,7 @@ msgid "~Minimum"
 msgstr "~Minimamu"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE\n"
@@ -3545,6 +3567,7 @@ msgid "Ma~ximum"
 msgstr "Ma~kizimamu"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE\n"
@@ -3577,6 +3600,7 @@ msgid "R~esolution"
 msgstr "~Mpfangano wo komba mivala"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE\n"
@@ -3609,6 +3633,7 @@ msgid "Ma~jor interval"
 msgstr "Ku ~hambana exikarhi"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE\n"
@@ -3650,6 +3675,7 @@ msgid "Minor inter~val"
 msgstr "Hlayisa vangwa ra ndhawu"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE\n"
@@ -3682,6 +3708,7 @@ msgid "Re~ference value"
 msgstr "Xikombo Ntikelo wa Xikombo (pfulekile)"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE\n"