Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

4 files changed, 52 insertions, 12 deletions

diff --git a/source/nr/reportdesign/source/core/resource.po b/source/nr/reportdesign/source/core/resource.po
index 086730001bc..615e6ce890e 100644
--- a/source/nr/reportdesign/source/core/resource.po
+++ b/source/nr/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 01:07+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\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/nr/reportdesign/source/ui/dlg.po b/source/nr/reportdesign/source/ui/dlg.po
index 1841d32fcb0..059aeaa838e 100644
--- a/source/nr/reportdesign/source/ui/dlg.po
+++ b/source/nr/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 00:52+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: CondFormat.src
 msgctxt ""
@@ -105,6 +105,7 @@ msgid "less than or equal to"
 msgstr "kulu kune namkha lingana ne"
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "WIN_CONDITION\n"
@@ -158,6 +159,7 @@ msgid "Condition $number$"
 msgstr ""
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "STR_COLOR_WHITE\n"
@@ -170,6 +172,7 @@ msgstr ""
 "Ubumhlophe"
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "STR_CHARCOLOR\n"
@@ -546,6 +549,7 @@ msgid "Prefix Characters"
 msgstr ""
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "STR_RPT_YEAR\n"
@@ -566,6 +570,7 @@ msgid "Quarter"
 msgstr "Amakota"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "STR_RPT_MONTH\n"
@@ -734,6 +739,7 @@ msgid "New Function"
 msgstr "Isigaba esitjha"
 
 #: Navigator.src
+#, fuzzy
 msgctxt ""
 "Navigator.src\n"
 "RID_MENU_NAVIGATOR\n"
@@ -814,6 +820,7 @@ msgid "General"
 msgstr "Vamileko"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS\n"
@@ -997,6 +1004,7 @@ msgid "Section Setup"
 msgstr ""
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
@@ -1020,6 +1028,7 @@ msgstr ""
 "Ifonti"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
@@ -1064,6 +1073,7 @@ msgid "Background"
 msgstr "Isendlalelo"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
@@ -1106,6 +1116,7 @@ msgid "Return"
 msgstr "Ukubuya"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR\n"
diff --git a/source/nr/reportdesign/source/ui/inspection.po b/source/nr/reportdesign/source/ui/inspection.po
index 7f7cb4c81be..05f001890e1 100644
--- a/source/nr/reportdesign/source/ui/inspection.po
+++ b/source/nr/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 01:07+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\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 ""
 "Mazombe"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PROPPAGE_DATA\n"
@@ -288,6 +290,7 @@ msgid "Section"
 msgstr "Isigaba"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_SECTIONPAGEBREAK_CONST\n"
@@ -403,6 +406,7 @@ msgid "Width"
 msgstr "Ububanzi"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_HEIGHT\n"
@@ -439,6 +443,7 @@ msgid "Preserve as Link"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_FORMULA\n"
@@ -463,6 +468,7 @@ msgid "Data field"
 msgstr "Iziko leDatha"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_FONT\n"
@@ -485,6 +491,7 @@ msgstr ""
 "Ifonti"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_BACKCOLOR\n"
@@ -623,6 +630,7 @@ msgid "Charts can be used to display detailed data about the current record of t
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_DETAILLABEL\n"
@@ -637,6 +645,7 @@ msgstr ""
 "Itjhadi"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_MASTERLABEL\n"
@@ -663,6 +672,7 @@ msgid "Preview Row(s)"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_AREA\n"
@@ -709,6 +719,7 @@ msgid "Middle"
 msgstr "Phakathi"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_VERTICAL_ALIGN_CONST\n"
@@ -742,6 +753,7 @@ msgid "Horz. Alignment"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -767,6 +779,7 @@ msgstr ""
 "Ngesinceleni"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -826,6 +839,7 @@ msgid "Accumulation"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_F_MINIMUM\n"
@@ -838,6 +852,7 @@ msgstr ""
 "Ubuncani"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_F_MAXIMUM\n"
diff --git a/source/nr/reportdesign/source/ui/report.po b/source/nr/reportdesign/source/ui/report.po
index 4d00f52f8b9..e1705264aec 100644
--- a/source/nr/reportdesign/source/ui/report.po
+++ b/source/nr/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 00:52+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: report.src
 msgctxt ""
@@ -31,6 +31,7 @@ msgid "No Control marked"
 msgstr "Akunalawulo elitshwayiweko"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_BRWTITLE_MULTISELECT\n"
@@ -45,6 +46,7 @@ msgstr ""
 "Ikhethohlanganisela"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_IMAGECONTROL\n"
@@ -59,6 +61,7 @@ msgstr ""
 "Ilawulo Lesithombe"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_FIXEDTEXT\n"
@@ -71,6 +74,7 @@ msgstr ""
 "Ikundla yokuleyibula"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_FIXEDLINE\n"
@@ -87,6 +91,7 @@ msgstr ""
 "Ilayini"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_FORMATTED\n"
@@ -111,6 +116,7 @@ msgid "Shape"
 msgstr "Ijamo"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_REPORT\n"
@@ -289,6 +295,7 @@ msgid "Design"
 msgstr "Tlama"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PREVIEW_VIEW\n"
@@ -315,6 +322,7 @@ msgstr ""
 "Ibonelo phambili"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "STR_RPT_TITLE\n"
@@ -484,6 +492,7 @@ msgid "Bring ~Forward"
 msgstr "Letha ~Phambili"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT.SID_ARRANGEMENU\n"
@@ -596,6 +605,7 @@ msgid "Distribution..."
 msgstr "Ukwaba"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT\n"
@@ -621,6 +631,7 @@ msgid "Add field:"
 msgstr "Engeza ikundla:"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_FILTER\n"
@@ -643,6 +654,7 @@ msgid " - %PRODUCTNAME Base Report"
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_APP_NEW_DOC\n"
@@ -693,6 +705,7 @@ msgid "Insert graphics"
 msgstr "Faka iintjengiso"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_DELETE\n"