Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

8 files changed, 40 insertions, 24 deletions

diff --git a/source/sat/sw/source/core/unocore.po b/source/sat/sw/source/core/unocore.po
index f49f301ef03..69faac08507 100644
--- a/source/sat/sw/source/core/unocore.po
+++ b/source/sat/sw/source/core/unocore.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/core/unocore
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 14:33+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"
 
 #: unocore.src
 msgctxt ""
@@ -39,6 +39,7 @@ msgid "Character"
 msgstr "आखोर"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_PARAGRAPH\n"
@@ -57,6 +58,7 @@ msgstr ""
 "खोद"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_FRAME\n"
@@ -73,6 +75,7 @@ msgstr ""
 "साज"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_PAGE\n"
@@ -91,6 +94,7 @@ msgstr ""
 "साहटा को"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_NUMBERING\n"
diff --git a/source/sat/sw/source/ui/app.po b/source/sat/sw/source/ui/app.po
index 5de022ac85d..45e2435e358 100644
--- a/source/sat/sw/source/ui/app.po
+++ b/source/sat/sw/source/ui/app.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/app
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:16+0000\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"
 "X-POOTLE-MTIME: 1366028204.0\n"
 
 #: app.src
@@ -1492,6 +1492,7 @@ msgid "Subscript"
 msgstr "उपस्क्रिप्ट"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_TEXT_ATTR\n"
@@ -1509,6 +1510,7 @@ msgstr ""
 "हुना़र (~y)"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_TEXT_ATTR.MN_FORMAT_ALGN\n"
@@ -1677,6 +1679,7 @@ msgid "Continue previous numbering"
 msgstr "पिछला क्रमांकन जारी रखें"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "_NUMBERING_RELATED_MENU\n"
diff --git a/source/sat/sw/source/ui/config.po b/source/sat/sw/source/ui/config.po
index 60c945e4d6c..39c73b1833e 100644
--- a/source/sat/sw/source/ui/config.po
+++ b/source/sat/sw/source/ui/config.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/config
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 15:34+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"
 
 #: mailconfigpage.src
 msgctxt ""
@@ -1134,6 +1134,7 @@ msgid "~Use only paper tray from printer preferences"
 msgstr ""
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1295,6 +1296,7 @@ msgid "Pa~ges"
 msgstr "साहटा"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
diff --git a/source/sat/sw/source/ui/dbui.po b/source/sat/sw/source/ui/dbui.po
index 3e786e7db2b..992cc76ba8f 100644
--- a/source/sat/sw/source/ui/dbui.po
+++ b/source/sat/sw/source/ui/dbui.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/dbui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-12-26 11:01+0000\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"
 "X-POOTLE-MTIME: 1356519667.0\n"
 
 #: addresslistdialog.src
@@ -2314,6 +2314,7 @@ msgid "Sen~d as"
 msgstr "लेका भेजा (~d)"
 
 #: mmoutputpage.src
+#, fuzzy
 msgctxt ""
 "mmoutputpage.src\n"
 "DLG_MM_OUTPUT_PAGE\n"
diff --git a/source/sat/sw/source/ui/docvw.po b/source/sat/sw/source/ui/docvw.po
index 7d8871cbf1a..65763710dc0 100644
--- a/source/sat/sw/source/ui/docvw.po
+++ b/source/sat/sw/source/ui/docvw.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/docvw
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-11 23:31+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"
 
 #: access.src
 msgctxt ""
@@ -135,6 +135,7 @@ msgid "Author"
 msgstr "ओनोलिया़"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_ANNOTATION_DATE_NAME\n"
@@ -209,6 +210,7 @@ msgid "%PRODUCTNAME Document"
 msgstr "%PRODUCTNAME दोलिल"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_DOC_WORDPROCESSING_READONLY\n"
diff --git a/source/sat/sw/source/ui/index.po b/source/sat/sw/source/ui/index.po
index ca5db66e1aa..4aebe08d130 100644
--- a/source/sat/sw/source/ui/index.po
+++ b/source/sat/sw/source/ui/index.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/index
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-01-05 14:35+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"
 
 #: cnttab.src
 msgctxt ""
@@ -1246,6 +1246,7 @@ msgid "Assignment"
 msgstr "जिनमा गोक्, भार गोक्"
 
 #: cnttab.src
+#, fuzzy
 msgctxt ""
 "cnttab.src\n"
 "DLG_ADD_IDX_STYLES\n"
@@ -1267,6 +1268,7 @@ msgstr ""
 "लेंगा"
 
 #: cnttab.src
+#, fuzzy
 msgctxt ""
 "cnttab.src\n"
 "DLG_ADD_IDX_STYLES\n"
diff --git a/source/sat/sw/source/ui/lingu.po b/source/sat/sw/source/ui/lingu.po
index d9ca41d37ec..52e674ba0c1 100644
--- a/source/sat/sw/source/ui/lingu.po
+++ b/source/sat/sw/source/ui/lingu.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/lingu
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 15:34+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"
 
 #: olmenu.src
 msgctxt ""
@@ -126,6 +126,7 @@ msgid "Reset to Default Language"
 msgstr ""
 
 #: olmenu.src
+#, fuzzy
 msgctxt ""
 "olmenu.src\n"
 "STR_LANGSTATUS_MORE\n"
diff --git a/source/sat/sw/source/ui/utlui.po b/source/sat/sw/source/ui/utlui.po
index 9bbff8969f2..28fea52d95b 100644
--- a/source/sat/sw/source/ui/utlui.po
+++ b/source/sat/sw/source/ui/utlui.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/utlui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:16+0000\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"
 "X-POOTLE-MTIME: 1366028208.0\n"
 
 #: attrdesc.src
@@ -2047,6 +2047,7 @@ msgid "Endnote Characters"
 msgstr "  मुचाद ओल आखोर"
 
 #: poolfmt.src
+#, fuzzy
 msgctxt ""
 "poolfmt.src\n"
 "STR_POOLPAGE_LANDSCAPE\n"