Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

3 files changed, 37 insertions, 9 deletions

diff --git a/source/sat/editeng/source/editeng.po b/source/sat/editeng/source/editeng.po
index 3d10a2c88d1..8c00aef16e6 100644
--- a/source/sat/editeng/source/editeng.po
+++ b/source/sat/editeng/source/editeng.po
@@ -1,4 +1,4 @@
-#. extracted from editeng/source/editeng
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,15 +7,16 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:15+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: 1366028144.0\n"
 
 #: editeng.src
+#, fuzzy
 msgctxt ""
 "editeng.src\n"
 "RID_EDITUNDO_DEL\n"
@@ -38,6 +39,7 @@ msgstr ""
 "मेटाव"
 
 #: editeng.src
+#, fuzzy
 msgctxt ""
 "editeng.src\n"
 "RID_EDITUNDO_MOVE\n"
@@ -50,6 +52,7 @@ msgstr ""
 " लाड़ाव होचो"
 
 #: editeng.src
+#, fuzzy
 msgctxt ""
 "editeng.src\n"
 "RID_EDITUNDO_INSERT\n"
@@ -72,6 +75,7 @@ msgstr ""
 "सोगे"
 
 #: editeng.src
+#, fuzzy
 msgctxt ""
 "editeng.src\n"
 "RID_EDITUNDO_REPLACE\n"
@@ -104,6 +108,7 @@ msgid "Reset attributes"
 msgstr "गालांग दोहड़ा साजाव"
 
 #: editeng.src
+#, fuzzy
 msgctxt ""
 "editeng.src\n"
 "RID_EDITUNDO_INDENT\n"
@@ -170,6 +175,7 @@ msgid "Ignore All"
 msgstr ""
 
 #: editeng.src
+#, fuzzy
 msgctxt ""
 "editeng.src\n"
 "RID_MENU_SPELL\n"
diff --git a/source/sat/editeng/source/items.po b/source/sat/editeng/source/items.po
index 27159055a7b..d00fe6a0654 100644
--- a/source/sat/editeng/source/items.po
+++ b/source/sat/editeng/source/items.po
@@ -1,4 +1,4 @@
-#. extracted from editeng/source/items
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:15+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: 1366028145.0\n"
 
 #: page.src
@@ -32,6 +32,7 @@ msgid "[From printer settings]"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TRUE\n"
@@ -156,6 +157,7 @@ msgid "Color "
 msgstr "रोङ"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_COLOR_BLACK\n"
@@ -304,6 +306,7 @@ msgid "Oblique italic"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_ITALIC_NORMAL\n"
@@ -342,6 +345,7 @@ msgid "ultra thin"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_WEIGHT_LIGHT\n"
@@ -410,6 +414,7 @@ msgid "ultra bold"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_WEIGHT_BLACK\n"
@@ -774,6 +779,7 @@ msgid "Strike through with Xes"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_CASEMAP_NONE\n"
@@ -818,6 +824,7 @@ msgid "Caps"
 msgstr "चिता़र"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_CASEMAP_GEMEINE\n"
@@ -830,6 +837,7 @@ msgstr ""
 "लातार आखोर ओबोसता"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_CASEMAP_TITEL\n"
@@ -952,6 +960,7 @@ msgid "Fill character:"
 msgstr "आखोर रेत्"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TAB_ADJUST_LEFT\n"
@@ -972,6 +981,7 @@ msgstr ""
 "लेंगा"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TAB_ADJUST_RIGHT\n"
@@ -992,6 +1002,7 @@ msgstr ""
 "जोजोम सेत्"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TAB_ADJUST_DECIMAL\n"
@@ -1014,6 +1025,7 @@ msgid "Centered"
 msgstr "ताला उता़र"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TAB_ADJUST_DEFAULT\n"
@@ -1124,6 +1136,7 @@ msgid "3D engraved"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_INSET\n"
@@ -1266,6 +1279,7 @@ msgid "Not Words Only"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_CONTOUR_TRUE\n"
@@ -1298,6 +1312,7 @@ msgid "No Outline"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_PRINT_TRUE\n"
@@ -1434,6 +1449,7 @@ msgid "Not Transparent"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_HYPHEN_TRUE\n"
@@ -1729,6 +1745,7 @@ msgid "Above"
 msgstr "चेतान"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_EMPHASIS_BELOW_POS\n"
@@ -1997,6 +2014,7 @@ msgid "Align left"
 msgstr "लेंगा सेदाक् थार होचो"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_HORJUST_CENTER\n"
@@ -2065,6 +2083,7 @@ msgid "Align to bottom"
 msgstr "लातार ला़गिद ते थार होचो"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_JUSTMETHOD_AUTO\n"
diff --git a/source/sat/editeng/source/outliner.po b/source/sat/editeng/source/outliner.po
index a1288371978..03e380e3955 100644
--- a/source/sat/editeng/source/outliner.po
+++ b/source/sat/editeng/source/outliner.po
@@ -1,4 +1,4 @@
-#. extracted from editeng/source/outliner
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,14 +7,15 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 14: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"
 
 #: outliner.src
+#, fuzzy
 msgctxt ""
 "outliner.src\n"
 "RID_OUTLUNDO_HEIGHT\n"
@@ -27,6 +28,7 @@ msgstr ""
 " लाड़ाव होचो"
 
 #: outliner.src
+#, fuzzy
 msgctxt ""
 "outliner.src\n"
 "RID_OUTLUNDO_DEPTH\n"
@@ -65,6 +67,7 @@ msgid "Apply attributes"
 msgstr "गालाङ बाहाल"
 
 #: outliner.src
+#, fuzzy
 msgctxt ""
 "outliner.src\n"
 "RID_OUTLUNDO_INSERT\n"