Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

4 files changed, 52 insertions, 12 deletions

diff --git a/source/sat/sc/source/core/src.po b/source/sat/sc/source/core/src.po
index 6d8f5dc22a0..dbcf85732f2 100644
--- a/source/sat/sc/source/core/src.po
+++ b/source/sat/sc/source/core/src.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/core/src
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,14 +7,15 @@ 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"
 
 #: compiler.src
+#, fuzzy
 msgctxt ""
 "compiler.src\n"
 "RID_FUNCTION_CATEGORIES\n"
@@ -50,6 +51,7 @@ msgid "Financial"
 msgstr "फोरोच"
 
 #: compiler.src
+#, fuzzy
 msgctxt ""
 "compiler.src\n"
 "RID_FUNCTION_CATEGORIES\n"
@@ -103,6 +105,7 @@ msgid "Statistical"
 msgstr "हिसाब बाबोत"
 
 #: compiler.src
+#, fuzzy
 msgctxt ""
 "compiler.src\n"
 "RID_FUNCTION_CATEGORIES\n"
@@ -118,6 +121,7 @@ msgstr ""
 "स्प्रेडशीट्"
 
 #: compiler.src
+#, fuzzy
 msgctxt ""
 "compiler.src\n"
 "RID_FUNCTION_CATEGORIES\n"
@@ -147,6 +151,7 @@ msgstr ""
 "Text"
 
 #: compiler.src
+#, fuzzy
 msgctxt ""
 "compiler.src\n"
 "RID_FUNCTION_CATEGORIES\n"
diff --git a/source/sat/sc/source/ui/cctrl.po b/source/sat/sc/source/ui/cctrl.po
index bf7a5b2651e..35eba18d5f2 100644
--- a/source/sat/sc/source/ui/cctrl.po
+++ b/source/sat/sc/source/ui/cctrl.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/ui/cctrl
+# 
 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"
 
 #: checklistmenu.src
 msgctxt ""
@@ -42,6 +42,7 @@ msgid "Custom Sort"
 msgstr "कुसियाक् तेयार"
 
 #: checklistmenu.src
+#, fuzzy
 msgctxt ""
 "checklistmenu.src\n"
 "RID_POPUP_FILTER\n"
diff --git a/source/sat/sc/source/ui/drawfunc.po b/source/sat/sc/source/ui/drawfunc.po
index 51ab5b9dd89..e0d3cf3488e 100644
--- a/source/sat/sc/source/ui/drawfunc.po
+++ b/source/sat/sc/source/ui/drawfunc.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/ui/drawfunc
+# 
 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"
 
 #: drformsh.src
 msgctxt ""
@@ -104,6 +104,7 @@ msgid "Popup menu for form objects"
 msgstr ""
 
 #: objdraw.src
+#, fuzzy
 msgctxt ""
 "objdraw.src\n"
 "MN_RESET\n"
@@ -148,6 +149,7 @@ msgid "~Style"
 msgstr "हुना़र (~S)"
 
 #: objdraw.src
+#, fuzzy
 msgctxt ""
 "objdraw.src\n"
 "MN_TEXT_ATTR.RID_MN_FORMAT_ALGN\n"
@@ -165,6 +167,7 @@ msgstr ""
 "लेंगा सेत्(~L)"
 
 #: objdraw.src
+#, fuzzy
 msgctxt ""
 "objdraw.src\n"
 "MN_TEXT_ATTR.RID_MN_FORMAT_ALGN\n"
@@ -207,6 +210,7 @@ msgid "~Alignment"
 msgstr "साजाव होचो (~A)"
 
 #: objdraw.src
+#, fuzzy
 msgctxt ""
 "objdraw.src\n"
 "MN_TEXT_ATTR\n"
@@ -283,6 +287,7 @@ msgid "Description..."
 msgstr "विवरोन"
 
 #: objdraw.src
+#, fuzzy
 msgctxt ""
 "objdraw.src\n"
 "MN_MIRRORSUB.SUBMENU_OBJMIRROR\n"
@@ -387,6 +392,7 @@ msgid "Drawing Object Bar"
 msgstr "चिता़र जिनिस "
 
 #: objdraw.src
+#, fuzzy
 msgctxt ""
 "objdraw.src\n"
 "RID_TEXT_TOOLBOX\n"
@@ -399,6 +405,7 @@ msgstr ""
 "ओलक् जिनिस हुरकाड़"
 
 #: objdraw.src
+#, fuzzy
 msgctxt ""
 "objdraw.src\n"
 "RID_GRAPHIC_OBJECTBAR\n"
diff --git a/source/sat/sc/source/ui/src.po b/source/sat/sc/source/ui/src.po
index 489e31991ee..0bdb3439998 100644
--- a/source/sat/sc/source/ui/src.po
+++ b/source/sat/sc/source/ui/src.po
@@ -1,4 +1,4 @@
-#. extracted from sc/source/ui/src
+# 
 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: 1366028181.0\n"
 
 #: autofmt.src
@@ -276,6 +276,7 @@ msgid "Minimum:"
 msgstr "कोम उता़र"
 
 #: colorformat.src
+#, fuzzy
 msgctxt ""
 "colorformat.src\n"
 "RID_SCDLG_DATABAR\n"
@@ -325,6 +326,7 @@ msgid "Color of vertical axis"
 msgstr ""
 
 #: colorformat.src
+#, fuzzy
 msgctxt ""
 "colorformat.src\n"
 "RID_SCDLG_DATABAR.LB_TYPE\n"
@@ -355,6 +357,7 @@ msgid "Minimum"
 msgstr "कोम उता़र"
 
 #: colorformat.src
+#, fuzzy
 msgctxt ""
 "colorformat.src\n"
 "RID_SCDLG_DATABAR.LB_TYPE\n"
@@ -404,6 +407,7 @@ msgid "Formula"
 msgstr "सांड़ेस नियोम (~F)"
 
 #: colorformat.src
+#, fuzzy
 msgctxt ""
 "colorformat.src\n"
 "RID_SCDLG_DATABAR.LB_AXIS_POSITION\n"
@@ -810,6 +814,7 @@ msgid "New Style..."
 msgstr ""
 
 #: condformatdlg.src
+#, fuzzy
 msgctxt ""
 "condformatdlg.src\n"
 "RID_COND_ENTRY.LB_TYPE_COL_SCALE_MIN\n"
@@ -885,6 +890,7 @@ msgid "Formula"
 msgstr "सांड़ेस नियोम (~F)"
 
 #: condformatdlg.src
+#, fuzzy
 msgctxt ""
 "condformatdlg.src\n"
 "RID_COND_ENTRY.LB_TYPE_COL_SCALE_MIDDLE\n"
@@ -960,6 +966,7 @@ msgid "Formula"
 msgstr "सांड़ेस नियोम (~F)"
 
 #: condformatdlg.src
+#, fuzzy
 msgctxt ""
 "condformatdlg.src\n"
 "RID_COND_ENTRY.LB_TYPE_COL_SCALE_MAX\n"
@@ -1386,6 +1393,7 @@ msgid "Remove"
 msgstr "Remove"
 
 #: condformatmgr.src
+#, fuzzy
 msgctxt ""
 "condformatmgr.src\n"
 "RID_SCDLG_COND_FORMAT_MANAGER\n"
@@ -6516,6 +6524,7 @@ msgid "Manual"
 msgstr ""
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6666,6 +6675,7 @@ msgid "AutoShape"
 msgstr ""
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6697,6 +6707,7 @@ msgid "Oval"
 msgstr ""
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6714,6 +6725,7 @@ msgstr ""
 "ओनोल बाक्स"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6727,6 +6739,7 @@ msgstr ""
 "बुता़म"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6744,6 +6757,7 @@ msgstr ""
 "बाकसा सुही ञेल"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6759,6 +6773,7 @@ msgstr ""
 "एपेटाक् बुताम"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6774,6 +6789,7 @@ msgstr ""
 "चिखना़"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6791,6 +6807,7 @@ msgstr ""
 "लिसटी बाक्स"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6842,6 +6859,7 @@ msgid "Cell Styles"
 msgstr " होहो हुना़र "
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -7560,6 +7578,7 @@ msgid "Cu~t"
 msgstr "केचाक् (~t)"
 
 #: hdrcont.src
+#, fuzzy
 msgctxt ""
 "hdrcont.src\n"
 "PART2\n"
@@ -8020,6 +8039,7 @@ msgid "~Move"
 msgstr " लाड़ाव होचो"
 
 #: miscdlgs.src
+#, fuzzy
 msgctxt ""
 "miscdlgs.src\n"
 "RID_SCDLG_MOVETAB\n"
@@ -8041,6 +8061,7 @@ msgstr ""
 "नोकोल  (~C)"
 
 #: miscdlgs.src
+#, fuzzy
 msgctxt ""
 "miscdlgs.src\n"
 "RID_SCDLG_MOVETAB\n"
@@ -8862,6 +8883,7 @@ msgid "~Delete"
 msgstr " मेटाव (~D)"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "RID_SCPAGE_USERLISTS\n"
@@ -9776,6 +9798,7 @@ msgid "Cu~t"
 msgstr "केचाक् (~t)"
 
 #: popup.src
+#, fuzzy
 msgctxt ""
 "popup.src\n"
 "RID_POPUP_CELLS\n"
@@ -9815,6 +9838,7 @@ msgid "P~aste Special..."
 msgstr "विसेस लाठा"
 
 #: popup.src
+#, fuzzy
 msgctxt ""
 "popup.src\n"
 "RID_POPUP_CELLS.SID_PASTE_ONLY\n"
@@ -25027,6 +25051,7 @@ msgstr ""
 "चेत् आम सारी गे मेनाक् सा़खियात् चोतान ओल सानाम काना?"
 
 #: scstring.src
+#, fuzzy
 msgctxt ""
 "scstring.src\n"
 "SCSTR_ALLFILTER\n"
@@ -25249,6 +25274,7 @@ msgid "%PRODUCTNAME Spreadsheets"
 msgstr "%PRODUCTNAME स्प्रेडसिट"
 
 #: scstring.src
+#, fuzzy
 msgctxt ""
 "scstring.src\n"
 "STR_ACC_DOC_SPREADSHEET_READONLY\n"
@@ -25493,6 +25519,7 @@ msgid "Settings:"
 msgstr "साजाव:"
 
 #: solveroptions.src
+#, fuzzy
 msgctxt ""
 "solveroptions.src\n"
 "RID_SCDLG_SOLVEROPTIONS\n"