Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

1 files changed, 28 insertions, 3 deletions

diff --git a/source/st/chart2/source/controller/dialogs.po b/source/st/chart2/source/controller/dialogs.po
index c85db2c598b..c0ac066b1ef 100644
--- a/source/st/chart2/source/controller/dialogs.po
+++ b/source/st/chart2/source/controller/dialogs.po
@@ -1,4 +1,4 @@
-#. extracted from chart2/source/controller/dialogs
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:24+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: st\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: st\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366028686.0\n"
 
 #: Strings.src
@@ -425,6 +425,7 @@ msgid "Main Title"
 msgstr "Thaetlele ya Sehloho"
 
 #: Strings.src
+#, fuzzy
 msgctxt ""
 "Strings.src\n"
 "STR_OBJECT_TITLE_SUB\n"
@@ -1033,6 +1034,7 @@ msgid ""
 msgstr ""
 
 #: Strings.src
+#, fuzzy
 msgctxt ""
 "Strings.src\n"
 "STR_TEXT_DIRECTION_LTR\n"
@@ -1045,6 +1047,7 @@ msgstr ""
 "Letshehadi ho ya ho le letona"
 
 #: Strings.src
+#, fuzzy
 msgctxt ""
 "Strings.src\n"
 "STR_TEXT_DIRECTION_RTL\n"
@@ -1658,6 +1661,7 @@ msgid "Font Position"
 msgstr "Boemo ba Fonte"
 
 #: dlg_ShapeFont.src
+#, fuzzy
 msgctxt ""
 "dlg_ShapeFont.src\n"
 "DLG_SHAPE_FONT\n"
@@ -1682,6 +1686,7 @@ msgstr ""
 "Tlhaku"
 
 #: dlg_ShapeParagraph.src
+#, fuzzy
 msgctxt ""
 "dlg_ShapeParagraph.src\n"
 "DLG_SHAPE_PARAGRAPH.1\n"
@@ -1785,6 +1790,7 @@ msgid "Best fit"
 msgstr ""
 
 #: res_DataLabel_tmpl.hrc
+#, fuzzy
 msgctxt ""
 "res_DataLabel_tmpl.hrc\n"
 "WORKAROUND\n"
@@ -1818,6 +1824,7 @@ msgid "Top left"
 msgstr "Hodimo ho le letshehadi"
 
 #: res_DataLabel_tmpl.hrc
+#, fuzzy
 msgctxt ""
 "res_DataLabel_tmpl.hrc\n"
 "WORKAROUND\n"
@@ -1852,6 +1859,7 @@ msgid "Bottom left"
 msgstr "Tlase ho le letshehadi"
 
 #: res_DataLabel_tmpl.hrc
+#, fuzzy
 msgctxt ""
 "res_DataLabel_tmpl.hrc\n"
 "WORKAROUND\n"
@@ -1876,6 +1884,7 @@ msgid "Bottom right"
 msgstr "Tlase ho le letona"
 
 #: res_DataLabel_tmpl.hrc
+#, fuzzy
 msgctxt ""
 "res_DataLabel_tmpl.hrc\n"
 "WORKAROUND\n"
@@ -2288,6 +2297,7 @@ msgid "New line"
 msgstr ""
 
 #: res_Titlesx_tmpl.hrc
+#, fuzzy
 msgctxt ""
 "res_Titlesx_tmpl.hrc\n"
 "TITLES( xpos, ypos, availableWidth, indentLabel, fixedLinesHeight )\n"
@@ -2678,6 +2688,7 @@ msgid "Stagger ~even"
 msgstr "Thekesela ho ~lekanetseng"
 
 #: tp_AxisLabel.src
+#, fuzzy
 msgctxt ""
 "tp_AxisLabel.src\n"
 "TP_AXIS_LABEL\n"
@@ -2759,6 +2770,7 @@ msgid "Value"
 msgstr "Boleng"
 
 #: tp_AxisPositions.src
+#, fuzzy
 msgctxt ""
 "tp_AxisPositions.src\n"
 "TP_AXIS_POSITIONS.LB_CROSSES_OTHER_AXIS_AT\n"
@@ -2789,6 +2801,7 @@ msgid "Axis ~between categories"
 msgstr ""
 
 #: tp_AxisPositions.src
+#, fuzzy
 msgctxt ""
 "tp_AxisPositions.src\n"
 "TP_AXIS_POSITIONS\n"
@@ -3083,6 +3096,7 @@ msgid "S~mooth lines"
 msgstr ""
 
 #: tp_ChartType.src
+#, fuzzy
 msgctxt ""
 "tp_ChartType.src\n"
 "TP_CHARTTYPE\n"
@@ -3163,6 +3177,7 @@ msgid "Data ~labels"
 msgstr "Matshwao a Boitsebiso"
 
 #: tp_DataSource.src
+#, fuzzy
 msgctxt ""
 "tp_DataSource.src\n"
 "TP_DATA_SOURCE\n"
@@ -3394,6 +3409,7 @@ msgid "T~ype"
 msgstr "M~ofuta"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE.LB_AXIS_TYPE\n"
@@ -3421,6 +3437,7 @@ msgstr ""
 "Ho iketsahalla feela"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE.LB_AXIS_TYPE\n"
@@ -3462,6 +3479,7 @@ msgstr ""
 "Mongolo"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE.LB_AXIS_TYPE\n"
@@ -3499,6 +3517,7 @@ msgstr ""
 "Letsatsi"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE\n"
@@ -3512,6 +3531,7 @@ msgstr ""
 "~Mmalwa"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE\n"
@@ -3538,6 +3558,7 @@ msgid "Ma~ximum"
 msgstr "Ng~ata"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE\n"
@@ -3574,6 +3595,7 @@ msgid "R~esolution"
 msgstr "~Tharollo"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE\n"
@@ -3610,6 +3632,7 @@ msgid "Ma~jor interval"
 msgstr "~Dikhefutso"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE\n"
@@ -3655,6 +3678,7 @@ msgid "Minor inter~val"
 msgstr "Boloka kgefutso ya ho etsa sebaka"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE\n"
@@ -3691,6 +3715,7 @@ msgid "Re~ference value"
 msgstr "Boleng ba tebiso (sebetsa)"
 
 #: tp_Scale.src
+#, fuzzy
 msgctxt ""
 "tp_Scale.src\n"
 "TP_SCALE\n"