Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

4 files changed, 47 insertions, 12 deletions

diff --git a/source/ts/reportdesign/source/core/resource.po b/source/ts/reportdesign/source/core/resource.po
index 47acbae80be..c51920a0079 100644
--- a/source/ts/reportdesign/source/core/resource.po
+++ b/source/ts/reportdesign/source/core/resource.po
@@ -1,4 +1,4 @@
-#. extracted from reportdesign/source/core/resource
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 04:04+0200\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"
 
 #: strings.src
 msgctxt ""
@@ -95,6 +95,7 @@ msgid "The element is invalid."
 msgstr ""
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_STR_FIXEDTEXT\n"
diff --git a/source/ts/reportdesign/source/ui/dlg.po b/source/ts/reportdesign/source/ui/dlg.po
index 3a52bc8807c..b8cdafc3abd 100644
--- a/source/ts/reportdesign/source/ui/dlg.po
+++ b/source/ts/reportdesign/source/ui/dlg.po
@@ -1,4 +1,4 @@
-#. extracted from reportdesign/source/ui/dlg
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:24+0200\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"
 
 #: CondFormat.src
 msgctxt ""
@@ -33,6 +33,7 @@ msgid "Expression Is"
 msgstr ""
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "WIN_CONDITION.LB_OP\n"
@@ -109,6 +110,7 @@ msgid "less than or equal to"
 msgstr "ehenhla ka kumbe ku ingana na"
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "WIN_CONDITION\n"
@@ -170,6 +172,7 @@ msgid "White"
 msgstr "Basa"
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "STR_CHARCOLOR\n"
@@ -478,6 +481,7 @@ msgid "Keep Together"
 msgstr ""
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "RID_GROUPS_SORTING.LST_KEEPTOGETHERLST\n"
@@ -686,6 +690,7 @@ msgid "Report navigator"
 msgstr ""
 
 #: Navigator.src
+#, fuzzy
 msgctxt ""
 "Navigator.src\n"
 "RID_STR_FUNCTIONS\n"
@@ -746,6 +751,7 @@ msgid "New Function"
 msgstr "Xiyenge xintshwa"
 
 #: Navigator.src
+#, fuzzy
 msgctxt ""
 "Navigator.src\n"
 "RID_MENU_NAVIGATOR\n"
@@ -826,6 +832,7 @@ msgid "General"
 msgstr "Tolovelekeke"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS\n"
@@ -868,6 +875,7 @@ msgid "Left"
 msgstr "Eximatsini"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS.LST_ALIGNMENT\n"
@@ -1015,6 +1023,7 @@ msgid "Section Setup"
 msgstr ""
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
@@ -1038,6 +1047,7 @@ msgstr ""
 "Nhlanga ya rito"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
@@ -1082,6 +1092,7 @@ msgid "Background"
 msgstr "Xise~kelo"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
diff --git a/source/ts/reportdesign/source/ui/inspection.po b/source/ts/reportdesign/source/ui/inspection.po
index 9f65cfe2e20..4775764969b 100644
--- a/source/ts/reportdesign/source/ui/inspection.po
+++ b/source/ts/reportdesign/source/ui/inspection.po
@@ -1,4 +1,4 @@
-#. extracted from reportdesign/source/ui/inspection
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,14 +7,15 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 04:04+0200\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"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PROPPAGE_DEFAULT\n"
@@ -37,6 +38,7 @@ msgstr ""
 "Tolovelekeke"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PROPPAGE_DATA\n"
@@ -288,6 +290,7 @@ msgid "Section"
 msgstr "Xiyenge"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_SECTIONPAGEBREAK_CONST\n"
@@ -395,6 +398,7 @@ msgid "Position Y"
 msgstr "XiyimoY"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_WIDTH\n"
@@ -417,6 +421,7 @@ msgstr ""
 "Vuanamo"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_HEIGHT\n"
@@ -453,6 +458,7 @@ msgid "Preserve as Link"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_FORMULA\n"
@@ -477,6 +483,7 @@ msgid "Data field"
 msgstr "Xivandla xa rungula"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_FONT\n"
@@ -499,6 +506,7 @@ msgstr ""
 "Nhlanga ya rito"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_BACKCOLOR\n"
@@ -661,6 +669,7 @@ msgid "Preview Row(s)"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_AREA\n"
@@ -707,6 +716,7 @@ msgid "Middle"
 msgstr "Xikarhi"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_VERTICAL_ALIGN_CONST\n"
@@ -740,6 +750,7 @@ msgid "Horz. Alignment"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -765,6 +776,7 @@ msgstr ""
 "Ximatsi"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -799,6 +811,7 @@ msgid "Block"
 msgstr "Ntima"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -838,6 +851,7 @@ msgid "Minimum"
 msgstr "Minimamu"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_F_MAXIMUM\n"
diff --git a/source/ts/reportdesign/source/ui/report.po b/source/ts/reportdesign/source/ui/report.po
index a154dad5862..41a1be6ebcb 100644
--- a/source/ts/reportdesign/source/ui/report.po
+++ b/source/ts/reportdesign/source/ui/report.po
@@ -1,4 +1,4 @@
-#. extracted from reportdesign/source/ui/report
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:24+0200\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"
 
 #: report.src
 msgctxt ""
@@ -39,6 +39,7 @@ msgid "Multiselection"
 msgstr "Nhlawulo-nyingi"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_IMAGECONTROL\n"
@@ -53,6 +54,7 @@ msgstr ""
 "Xilawuri xa Xifaniso"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_FIXEDTEXT\n"
@@ -73,6 +75,7 @@ msgid "Line"
 msgstr "Layini"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_FORMATTED\n"
@@ -265,6 +268,7 @@ msgid "Design"
 msgstr "Endlelo"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PREVIEW_VIEW\n"
@@ -441,6 +445,7 @@ msgid "Grid..."
 msgstr "~Mabokisi..."
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT.SID_ARRANGEMENU\n"
@@ -562,6 +567,7 @@ msgid "Distribution..."
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT\n"
@@ -587,6 +593,7 @@ msgid "Add field:"
 msgstr "Engetela Xivandla:"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_FILTER\n"
@@ -609,6 +616,7 @@ msgid " - %PRODUCTNAME Base Report"
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_APP_NEW_DOC\n"
@@ -659,6 +667,7 @@ msgid "Insert graphics"
 msgstr "Nghenisa vudirowi"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_DELETE\n"