Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

4 files changed, 37 insertions, 12 deletions

diff --git a/source/brx/reportdesign/source/core/resource.po b/source/brx/reportdesign/source/core/resource.po
index 81f5be4d7d2..c94ad20dd10 100644
--- a/source/brx/reportdesign/source/core/resource.po
+++ b/source/brx/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 09:29+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: brx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: brx\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: strings.src
 msgctxt ""
@@ -119,6 +119,7 @@ msgid "Image control"
 msgstr "मुसुखा दबथायनाय"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_STR_REPORT\n"
diff --git a/source/brx/reportdesign/source/ui/dlg.po b/source/brx/reportdesign/source/ui/dlg.po
index 5638cc137dd..37648df5c8b 100644
--- a/source/brx/reportdesign/source/ui/dlg.po
+++ b/source/brx/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-11 23:49+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: brx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: brx\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: CondFormat.src
 msgctxt ""
@@ -321,6 +321,7 @@ msgid "Move down"
 msgstr "गाहायाव लाबो"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "RID_GROUPS_SORTING.TB_TOOLBOX\n"
@@ -378,6 +379,7 @@ msgid "Sorting"
 msgstr "थाखो खालामनाय"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "RID_GROUPS_SORTING.LST_ORDER\n"
@@ -395,6 +397,7 @@ msgstr ""
 "गोजौथिं बांनाय फारि"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "RID_GROUPS_SORTING.LST_ORDER\n"
@@ -698,6 +701,7 @@ msgid "Report navigator"
 msgstr ""
 
 #: Navigator.src
+#, fuzzy
 msgctxt ""
 "Navigator.src\n"
 "RID_STR_FUNCTIONS\n"
@@ -848,6 +852,7 @@ msgid "Left"
 msgstr "आगसि"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS.LST_ALIGNMENT\n"
diff --git a/source/brx/reportdesign/source/ui/inspection.po b/source/brx/reportdesign/source/ui/inspection.po
index 6e4d0171f8a..6c9db7ab5ef 100644
--- a/source/brx/reportdesign/source/ui/inspection.po
+++ b/source/brx/reportdesign/source/ui/inspection.po
@@ -1,4 +1,4 @@
-#. extracted from reportdesign/source/ui/inspection
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 09:30+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: brx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: brx\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: inspection.src
 msgctxt ""
@@ -268,6 +268,7 @@ msgid "Section"
 msgstr "बिफान"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_SECTIONPAGEBREAK_CONST\n"
@@ -373,6 +374,7 @@ msgid "Position Y"
 msgstr "थानाय जायगा Y"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_WIDTH\n"
@@ -391,6 +393,7 @@ msgstr ""
 "गुवारथि"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_HEIGHT\n"
@@ -447,6 +450,7 @@ msgid "Font"
 msgstr "फन्ट"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_BACKCOLOR\n"
@@ -593,6 +597,7 @@ msgid "Chart"
 msgstr "चार्ट"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_MASTERLABEL\n"
@@ -641,6 +646,7 @@ msgid "Vert. Alignment"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_VERTICAL_ALIGN_CONST\n"
@@ -675,6 +681,7 @@ msgid "Middle"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_VERTICAL_ALIGN_CONST\n"
@@ -735,6 +742,7 @@ msgid "Block"
 msgstr "गोसोम"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -766,6 +774,7 @@ msgid "Accumulation"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_F_MINIMUM\n"
@@ -778,6 +787,7 @@ msgstr ""
 "इसे बिबां"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_F_MAXIMUM\n"
diff --git a/source/brx/reportdesign/source/ui/report.po b/source/brx/reportdesign/source/ui/report.po
index 3c7fd96416a..dddd28ca1f2 100644
--- a/source/brx/reportdesign/source/ui/report.po
+++ b/source/brx/reportdesign/source/ui/report.po
@@ -1,4 +1,4 @@
-#. extracted from reportdesign/source/ui/report
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,14 +7,15 @@ msgstr ""
 "PO-Revision-Date: 2011-04-11 23:49+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: brx\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: brx\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_BRWTITLE_PROPERTIES\n"
@@ -35,6 +36,7 @@ msgid "No Control marked"
 msgstr "जेबो दबथायनाय दाग गैया."
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_BRWTITLE_MULTISELECT\n"
@@ -73,6 +75,7 @@ msgid "Line"
 msgstr "सारि"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_FORMATTED\n"
@@ -97,6 +100,7 @@ msgid "Shape"
 msgstr "महर"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_REPORT\n"
@@ -273,6 +277,7 @@ msgid "Design"
 msgstr "डिजाइन"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PREVIEW_VIEW\n"
@@ -295,6 +300,7 @@ msgstr ""
 "गिबि नुथाय"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "STR_RPT_TITLE\n"
@@ -462,6 +468,7 @@ msgid "Bring ~Forward"
 msgstr "सिगाङाव लाबो"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT.SID_ARRANGEMENU\n"
@@ -591,6 +598,7 @@ msgid "Add field:"
 msgstr "फोथार दाजाब:"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_FILTER\n"
@@ -613,6 +621,7 @@ msgid " - %PRODUCTNAME Base Report"
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_APP_NEW_DOC\n"