Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

4 files changed, 49 insertions, 12 deletions

diff --git a/source/sat/reportdesign/source/core/resource.po b/source/sat/reportdesign/source/core/resource.po
index d239f9b0fce..0d790ccbadf 100644
--- a/source/sat/reportdesign/source/core/resource.po
+++ b/source/sat/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 14:32+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sat\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sat\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: strings.src
 msgctxt ""
@@ -119,6 +119,7 @@ msgid "Image control"
 msgstr "चिता़र सांबड़ाव (~g)"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_STR_REPORT\n"
diff --git a/source/sat/reportdesign/source/ui/dlg.po b/source/sat/reportdesign/source/ui/dlg.po
index 3ab29372882..09dcef32bec 100644
--- a/source/sat/reportdesign/source/ui/dlg.po
+++ b/source/sat/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:04+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sat\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sat\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"
@@ -211,6 +212,7 @@ msgid "Remove sorting"
 msgstr ""
 
 #: CondFormat.src
+#, fuzzy
 msgctxt ""
 "CondFormat.src\n"
 "RID_TB_SORTING\n"
@@ -339,6 +341,7 @@ msgid "Move down"
 msgstr "लातार चालाव"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "RID_GROUPS_SORTING.TB_TOOLBOX\n"
@@ -392,6 +395,7 @@ msgid "Sorting"
 msgstr "साला"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "RID_GROUPS_SORTING.LST_ORDER\n"
@@ -407,6 +411,7 @@ msgstr ""
 "राकबोक् थार"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "RID_GROUPS_SORTING.LST_ORDER\n"
@@ -580,6 +585,7 @@ msgid "Prefix Characters"
 msgstr ""
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "STR_RPT_YEAR\n"
@@ -616,6 +622,7 @@ msgid "Week"
 msgstr "हाट"
 
 #: GroupsSorting.src
+#, fuzzy
 msgctxt ""
 "GroupsSorting.src\n"
 "STR_RPT_DAY\n"
@@ -718,6 +725,7 @@ msgid "Report navigator"
 msgstr ""
 
 #: Navigator.src
+#, fuzzy
 msgctxt ""
 "Navigator.src\n"
 "RID_STR_FUNCTIONS\n"
@@ -776,6 +784,7 @@ msgid "New Function"
 msgstr "नावा विभाग"
 
 #: Navigator.src
+#, fuzzy
 msgctxt ""
 "Navigator.src\n"
 "RID_MENU_NAVIGATOR\n"
@@ -854,6 +863,7 @@ msgid "General"
 msgstr "साधारोन"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS\n"
@@ -883,6 +893,7 @@ msgstr ""
 " साजाव होचो"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS.LST_ALIGNMENT\n"
@@ -913,6 +924,7 @@ msgid "Center"
 msgstr "ताला"
 
 #: PageNumber.src
+#, fuzzy
 msgctxt ""
 "PageNumber.src\n"
 "RID_PAGENUMBERS.LST_ALIGNMENT\n"
@@ -1066,6 +1078,7 @@ msgid "Font"
 msgstr "चिकी"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
@@ -1110,6 +1123,7 @@ msgid "Background"
 msgstr "उनुरुम"
 
 #: dlgpage.src
+#, fuzzy
 msgctxt ""
 "dlgpage.src\n"
 "RID_PAGEDIALOG_CHAR.1\n"
diff --git a/source/sat/reportdesign/source/ui/inspection.po b/source/sat/reportdesign/source/ui/inspection.po
index 0467a34ddc6..c78217dbca8 100644
--- a/source/sat/reportdesign/source/ui/inspection.po
+++ b/source/sat/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 14:32+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sat\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sat\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: inspection.src
 msgctxt ""
@@ -40,6 +40,7 @@ msgid "No"
 msgstr "बाङ"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_BOOL\n"
@@ -278,6 +279,7 @@ msgid "Section"
 msgstr "हा़टिञ"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_SECTIONPAGEBREAK_CONST\n"
@@ -415,6 +417,7 @@ msgid "Preserve as Link"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_FORMULA\n"
@@ -585,6 +588,7 @@ msgid "Chart"
 msgstr "चार्ट"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_MASTERLABEL\n"
@@ -631,6 +635,7 @@ msgid "Vert. Alignment"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_VERTICAL_ALIGN_CONST\n"
@@ -665,6 +670,7 @@ msgid "Middle"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_VERTICAL_ALIGN_CONST\n"
@@ -698,6 +704,7 @@ msgid "Horz. Alignment"
 msgstr ""
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -719,6 +726,7 @@ msgstr ""
 "लेंगा"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_PARAADJUST_CONST\n"
@@ -782,6 +790,7 @@ msgid "Minimum"
 msgstr "कोम उता़र"
 
 #: inspection.src
+#, fuzzy
 msgctxt ""
 "inspection.src\n"
 "RID_STR_F_MAXIMUM\n"
diff --git a/source/sat/reportdesign/source/ui/report.po b/source/sat/reportdesign/source/ui/report.po
index 20f557291ca..08409bf3e8d 100644
--- a/source/sat/reportdesign/source/ui/report.po
+++ b/source/sat/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-12 01:04+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sat\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sat\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"
@@ -49,6 +51,7 @@ msgstr ""
 "आड़ी लेकान बाछाव"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_IMAGECONTROL\n"
@@ -79,6 +82,7 @@ msgid "Line"
 msgstr "गार"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_FORMATTED\n"
@@ -103,6 +107,7 @@ msgid "Shape"
 msgstr "रूप"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_PROPTITLE_REPORT\n"
@@ -285,6 +290,7 @@ msgid "Preview"
 msgstr "लाहा तेयाक् ञेनेल"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "STR_RPT_TITLE\n"
@@ -441,6 +447,7 @@ msgid "Grid..."
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT.SID_ARRANGEMENU\n"
@@ -454,6 +461,7 @@ msgstr ""
 "लाहा सेत् आ़गु"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT.SID_ARRANGEMENU\n"
@@ -566,6 +574,7 @@ msgid "Distribution..."
 msgstr "हा़टिञ(~D)"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_MENU_REPORT\n"
@@ -589,6 +598,7 @@ msgid "Add field:"
 msgstr "सेलेद जायगा:"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_FILTER\n"
@@ -609,6 +619,7 @@ msgid " - %PRODUCTNAME Base Report"
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_APP_NEW_DOC\n"
@@ -659,6 +670,7 @@ msgid "Insert graphics"
 msgstr "चिता़र को आदेर"
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_DELETE\n"
@@ -833,6 +845,7 @@ msgid "Report Footer"
 msgstr ""
 
 #: report.src
+#, fuzzy
 msgctxt ""
 "report.src\n"
 "RID_STR_INSERT\n"