Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

3 files changed, 28 insertions, 9 deletions

diff --git a/source/ss/reportdesign/source/ui/dlg.po b/source/ss/reportdesign/source/ui/dlg.po
index 25ad43daf2d..e7467302660 100644
--- a/source/ss/reportdesign/source/ui/dlg.po
+++ b/source/ss/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:08+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"
 
 #: CondFormat.src
 msgctxt ""
@@ -207,6 +207,7 @@ msgid "Remove sorting"
 msgstr ""
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "RID_TB_SORTING\n"
@@ -672,6 +673,7 @@ msgid "Report navigator"
 msgstr ""
 
 #: Navigator.src
+#, fuzzy
 msgctxt ""
 "Navigator.src\n"
 "RID_STR_FUNCTIONS\n"
@@ -804,6 +806,7 @@ msgid "General"
 msgstr "Vamile"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS\n"
@@ -996,6 +999,7 @@ msgid "Font"
 msgstr "Ifonti"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
@@ -1040,6 +1044,7 @@ msgid "Background"
 msgstr "Likamuva"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
diff --git a/source/ss/reportdesign/source/ui/inspection.po b/source/ss/reportdesign/source/ui/inspection.po
index 5ed3e82e45d..ff6d1e4e44d 100644
--- a/source/ss/reportdesign/source/ui/inspection.po
+++ b/source/ss/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 02:10+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"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PROPPAGE_DEFAULT\n"
@@ -273,6 +274,7 @@ msgid "None"
 msgstr "Kute"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_SECTIONPAGEBREAK_CONST\n"
@@ -391,6 +393,7 @@ msgid "Width"
 msgstr "Bubanti"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_HEIGHT\n"
@@ -649,6 +652,7 @@ msgid "Middle"
 msgstr "Emkhatsini"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_VERTICAL_ALIGN_CONST\n"
@@ -734,6 +738,7 @@ msgid "Accumulation"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_F_MINIMUM\n"
@@ -746,6 +751,7 @@ msgstr ""
 "Lizinga leliphansi kakhulu"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_F_MAXIMUM\n"
diff --git a/source/ss/reportdesign/source/ui/report.po b/source/ss/reportdesign/source/ui/report.po
index 525600a003d..4d63be0a75d 100644
--- a/source/ss/reportdesign/source/ui/report.po
+++ b/source/ss/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:08+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"
 
 #: report.src
 msgctxt ""
@@ -31,6 +31,7 @@ msgid "No Control marked"
 msgstr "Kute baphatsi labaphawuliwe"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_BRWTITLE_MULTISELECT\n"
@@ -45,6 +46,7 @@ msgstr ""
 "Kukhetsanyenti"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_IMAGECONTROL\n"
@@ -259,6 +261,7 @@ msgid "Design"
 msgstr "Umsiko"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PREVIEW_VIEW\n"
@@ -435,6 +438,7 @@ msgid "Grid..."
 msgstr "~Emagridi..."
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT.SID_ARRANGEMENU\n"
@@ -448,6 +452,7 @@ msgstr ""
 "Buyisela ~emuva"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT.SID_ARRANGEMENU\n"
@@ -577,6 +582,7 @@ msgid "Add field:"
 msgstr "Yengeta insimi:"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_FILTER\n"
@@ -599,6 +605,7 @@ msgid " - %PRODUCTNAME Base Report"
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_APP_NEW_DOC\n"
@@ -809,6 +816,7 @@ msgid "Report Footer"
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_INSERT\n"