Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

6 files changed, 40 insertions, 18 deletions

diff --git a/source/sat/svx/source/dialog.po b/source/sat/svx/source/dialog.po
index ec2ae984f69..1ae54d31036 100644
--- a/source/sat/svx/source/dialog.po
+++ b/source/sat/svx/source/dialog.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/dialog
+# 
 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: 1366028198.0\n"
 
 #: bmpmask.src
@@ -541,6 +541,7 @@ msgid ""
 msgstr ""
 
 #: docrecovery.src
+#, fuzzy
 msgctxt ""
 "docrecovery.src\n"
 "RID_SVXPAGE_DOCRECOVERY_RECOVER\n"
@@ -1012,6 +1013,7 @@ msgid "Slant"
 msgstr "तिरछा"
 
 #: fontwork.src
+#, fuzzy
 msgctxt ""
 "fontwork.src\n"
 "RID_SVXDLG_FONTWORK\n"
@@ -1693,6 +1695,7 @@ msgid "~Ask when linking a graphic"
 msgstr ""
 
 #: optgrid.src
+#, fuzzy
 msgctxt ""
 "optgrid.src\n"
 "RID_SVXPAGE_GRID\n"
@@ -1737,6 +1740,7 @@ msgid "Resolution"
 msgstr "निसटा़ (~R)"
 
 #: optgrid.src
+#, fuzzy
 msgctxt ""
 "optgrid.src\n"
 "RID_SVXPAGE_GRID\n"
@@ -1754,6 +1758,7 @@ msgstr ""
 "भिंदाड़ गार"
 
 #: optgrid.src
+#, fuzzy
 msgctxt ""
 "optgrid.src\n"
 "RID_SVXPAGE_GRID\n"
@@ -1778,6 +1783,7 @@ msgid "Subdivision"
 msgstr ""
 
 #: optgrid.src
+#, fuzzy
 msgctxt ""
 "optgrid.src\n"
 "RID_SVXPAGE_GRID\n"
@@ -1921,6 +1927,7 @@ msgid "When ro~tating"
 msgstr ""
 
 #: optgrid.src
+#, fuzzy
 msgctxt ""
 "optgrid.src\n"
 "RID_SVXPAGE_GRID\n"
@@ -1943,6 +1950,7 @@ msgid "Point reducti~on"
 msgstr "टुड़ाक् कोम होचो"
 
 #: optgrid.src
+#, fuzzy
 msgctxt ""
 "optgrid.src\n"
 "RID_SVXPAGE_GRID\n"
@@ -3118,6 +3126,7 @@ msgid "From the Middle, Violet"
 msgstr "नांमुन खोन(~F)"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT38\n"
@@ -3158,6 +3167,7 @@ msgid "Horizontal Orange"
 msgstr "भिंदाड़ गार"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT42\n"
diff --git a/source/sat/svx/source/form.po b/source/sat/svx/source/form.po
index 786e4ccf786..b96d72f53b6 100644
--- a/source/sat/svx/source/form.po
+++ b/source/sat/svx/source/form.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/form
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:05+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"
 
 #: datanavi.src
 msgctxt ""
@@ -1436,6 +1436,7 @@ msgid "Form"
 msgstr "फोर्म"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_TABWIN_PREFIX\n"
@@ -2034,6 +2035,7 @@ msgid "Count"
 msgstr "एलखा"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_SQL_INTERNATIONAL\n"
@@ -2056,6 +2058,7 @@ msgid "Minimum"
 msgstr "कोम उता़र"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_SQL_INTERNATIONAL\n"
@@ -2273,6 +2276,7 @@ msgid " (read-only)"
 msgstr ""
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_STR_ALREADYEXISTOVERWRITE\n"
diff --git a/source/sat/svx/source/gallery2.po b/source/sat/svx/source/gallery2.po
index 767415b07b1..2d6e26e313a 100644
--- a/source/sat/svx/source/gallery2.po
+++ b/source/sat/svx/source/gallery2.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/gallery2
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-12-26 11:00+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: 1356519641.0\n"
 
 #: gallery.src
@@ -1158,6 +1158,7 @@ msgid "Computer - WIFI"
 msgstr ""
 
 #: galtheme.src
+#, fuzzy
 msgctxt ""
 "galtheme.src\n"
 "RID_GALLERYSTR_THEME_NUMBERS\n"
@@ -1180,6 +1181,7 @@ msgid "Signs - danger"
 msgstr ""
 
 #: galtheme.src
+#, fuzzy
 msgctxt ""
 "galtheme.src\n"
 "RID_GALLERYSTR_THEME_OBJECTS\n"
diff --git a/source/sat/svx/source/src.po b/source/sat/svx/source/src.po
index 9a589e904f8..7ca188abd5c 100644
--- a/source/sat/svx/source/src.po
+++ b/source/sat/svx/source/src.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/src
+# 
 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"
 
 #: app.src
 msgctxt ""
@@ -32,6 +32,7 @@ msgid "Error"
 msgstr "भुल"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRCTX\n"
@@ -371,6 +372,7 @@ msgid "Nonexistent file."
 msgstr "बानुक् आकान रेत्"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRHDL\n"
@@ -668,6 +670,7 @@ msgid "The wrong password has been entered."
 msgstr "The wrong password has been entered"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRHDL\n"
diff --git a/source/sat/svx/source/svdraw.po b/source/sat/svx/source/svdraw.po
index db9e076aa5d..044435fd9de 100644
--- a/source/sat/svx/source/svdraw.po
+++ b/source/sat/svx/source/svdraw.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/svdraw
+# 
 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: 1366028201.0\n"
 
 #: svdstr.src
@@ -4912,6 +4912,7 @@ msgid "Table style settings"
 msgstr ""
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNameSingulTable\n"
@@ -4936,6 +4937,7 @@ msgstr ""
 "ता़लिका"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNamePluralTable\n"
diff --git a/source/sat/svx/source/tbxctrls.po b/source/sat/svx/source/tbxctrls.po
index 7345f8381b8..ef80a4959d4 100644
--- a/source/sat/svx/source/tbxctrls.po
+++ b/source/sat/svx/source/tbxctrls.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/tbxctrls
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:05+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"
 
 #: colrctrl.src
 msgctxt ""
@@ -739,6 +739,7 @@ msgid "Font Name. The current font is not available and will be substituted."
 msgstr ""
 
 #: tbunosearchcontrollers.src
+#, fuzzy
 msgctxt ""
 "tbunosearchcontrollers.src\n"
 "RID_SVXSTR_FINDBAR_FIND\n"