Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

4 files changed, 61 insertions, 12 deletions

diff --git a/source/sat/sfx2/source/appl.po b/source/sat/sfx2/source/appl.po
index 2a1e619b188..02eb3e67c02 100644
--- a/source/sat/sfx2/source/appl.po
+++ b/source/sat/sfx2/source/appl.po
@@ -1,4 +1,4 @@
-#. extracted from sfx2/source/appl
+# 
 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"
 
 #: app.src
 msgctxt ""
@@ -39,6 +39,7 @@ msgid "Automatic"
 msgstr "आच् आच् ते"
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "STR_STANDARD_SHORTCUT\n"
@@ -59,6 +60,7 @@ msgid "Bytes"
 msgstr "बइट्स"
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "STR_KB\n"
@@ -79,6 +81,7 @@ msgid "MB"
 msgstr "MB"
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "STR_GB\n"
@@ -203,6 +206,7 @@ msgid "Format"
 msgstr "तेयार"
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "GID_TEMPLATE\n"
@@ -217,6 +221,7 @@ msgstr ""
 "नामुना"
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "GID_TEXT\n"
@@ -261,6 +266,7 @@ msgid "Graphic"
 msgstr "ता़लिका"
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "GID_TABLE\n"
@@ -285,6 +291,7 @@ msgstr ""
 "ता़लिका"
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "GID_ENUMERATION\n"
@@ -359,6 +366,7 @@ msgid "Modify"
 msgstr "बोदोल"
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "GID_DRAWING\n"
@@ -513,6 +521,7 @@ msgid "%PRODUCTNAME %PRODUCTVERSION"
 msgstr "%PRODUCTNAME %PRODUCTVERSION"
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "STR_QUICKSTART_FILE\n"
@@ -641,6 +650,7 @@ msgid " (Signed)"
 msgstr "(सुही)"
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "STR_STANDARD\n"
@@ -705,6 +715,7 @@ msgid ""
 msgstr ""
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "RID_SVXSTR_GRFILTER_OPENERROR\n"
@@ -717,6 +728,7 @@ msgstr ""
 "चितार रेद बाङ झिज दाड़ेआ"
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "RID_SVXSTR_GRFILTER_IOERROR\n"
@@ -745,6 +757,7 @@ msgid "This version of the graphics file is not supported"
 msgstr ""
 
 #: app.src
+#, fuzzy
 msgctxt ""
 "app.src\n"
 "RID_SVXSTR_GRFILTER_FILTERERROR\n"
diff --git a/source/sat/sfx2/source/dialog.po b/source/sat/sfx2/source/dialog.po
index 7b95adf281d..dd683cda5bd 100644
--- a/source/sat/sfx2/source/dialog.po
+++ b/source/sat/sfx2/source/dialog.po
@@ -1,4 +1,4 @@
-#. extracted from sfx2/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: 1366028189.0\n"
 
 #: alienwarn.src
@@ -72,6 +72,7 @@ msgid "Confirm File Format"
 msgstr ""
 
 #: dialog.src
+#, fuzzy
 msgctxt ""
 "dialog.src\n"
 "STR_RESET\n"
@@ -84,6 +85,7 @@ msgstr ""
 "दोहड़ा साजाव (~R)"
 
 #: dialog.src
+#, fuzzy
 msgctxt ""
 "dialog.src\n"
 "STR_APPLY\n"
@@ -205,6 +207,7 @@ msgid "Delete..."
 msgstr "मेटाव (~D)..."
 
 #: dialog.src
+#, fuzzy
 msgctxt ""
 "dialog.src\n"
 "SID_NAVIGATOR\n"
@@ -345,6 +348,7 @@ msgid "Document number"
 msgstr ""
 
 #: dinfdlg.src
+#, fuzzy
 msgctxt ""
 "dinfdlg.src\n"
 "SFX_CB_PROPERTY_NAME\n"
@@ -394,6 +398,7 @@ msgid "Info"
 msgstr "सूचना"
 
 #: dinfdlg.src
+#, fuzzy
 msgctxt ""
 "dinfdlg.src\n"
 "SFX_CB_PROPERTY_NAME\n"
@@ -499,6 +504,7 @@ msgid "Recorded date"
 msgstr ""
 
 #: dinfdlg.src
+#, fuzzy
 msgctxt ""
 "dinfdlg.src\n"
 "SFX_CB_PROPERTY_NAME\n"
@@ -521,6 +527,7 @@ msgid "Source"
 msgstr "मूल  (~S)"
 
 #: dinfdlg.src
+#, fuzzy
 msgctxt ""
 "dinfdlg.src\n"
 "SFX_CB_PROPERTY_NAME\n"
@@ -556,6 +563,7 @@ msgid "Typist"
 msgstr ""
 
 #: dinfdlg.src
+#, fuzzy
 msgctxt ""
 "dinfdlg.src\n"
 "SFX_CB_PROPERTY_NAME\n"
@@ -579,6 +587,7 @@ msgstr ""
 "URL"
 
 #: dinfdlg.src
+#, fuzzy
 msgctxt ""
 "dinfdlg.src\n"
 "SFX_LB_PROPERTY_TYPE\n"
@@ -617,6 +626,7 @@ msgid "DateTime"
 msgstr "<साहित/ओकतो>"
 
 #: dinfdlg.src
+#, fuzzy
 msgctxt ""
 "dinfdlg.src\n"
 "SFX_LB_PROPERTY_TYPE\n"
@@ -687,6 +697,7 @@ msgid " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6"
 msgstr ""
 
 #: dinfdlg.src
+#, fuzzy
 msgctxt ""
 "dinfdlg.src\n"
 "SFX_WIN_PROPERTY_YESNO\n"
@@ -822,6 +833,7 @@ msgid "Edit Duration"
 msgstr "सापड़ाव का़मी"
 
 #: dinfedt.src
+#, fuzzy
 msgctxt ""
 "dinfedt.src\n"
 "DLG_DOCINFO_EDT\n"
@@ -851,6 +863,7 @@ msgid "Current version"
 msgstr "नितोक् हा़लियाक्"
 
 #: filedlghelper.src
+#, fuzzy
 msgctxt ""
 "filedlghelper.src\n"
 "STR_SFX_EXPLORERFILE_EXPORT\n"
@@ -865,6 +878,7 @@ msgstr ""
 "बाहरे भेजा"
 
 #: filedlghelper.src
+#, fuzzy
 msgctxt ""
 "filedlghelper.src\n"
 "STR_SFX_EXPLORERFILE_INSERT\n"
@@ -887,6 +901,7 @@ msgstr ""
 "सोगे"
 
 #: filedlghelper.src
+#, fuzzy
 msgctxt ""
 "filedlghelper.src\n"
 "STR_SFX_EXPLORERFILE_BUTTONINSERT\n"
@@ -921,6 +936,7 @@ msgid "~Automatic file name extension"
 msgstr "आच् ते रेत रेयाक् ञुतुम जिलिञोक् (~A)"
 
 #: filedlghelper.src
+#, fuzzy
 msgctxt ""
 "filedlghelper.src\n"
 "STR_CB_SELECTION\n"
@@ -935,6 +951,7 @@ msgstr ""
 "बाछाव (~S)"
 
 #: filedlghelper.src
+#, fuzzy
 msgctxt ""
 "filedlghelper.src\n"
 "STR_CB_INSERT_AS_LINK\n"
@@ -983,6 +1000,7 @@ msgid "Edit ~filter settings"
 msgstr "छानियाक् गोटा सापड़ाव (~f)"
 
 #: filedlghelper.src
+#, fuzzy
 msgctxt ""
 "filedlghelper.src\n"
 "STR_PB_PLAY\n"
@@ -1005,6 +1023,7 @@ msgid "Sto~p"
 msgstr "बोंद (~P)"
 
 #: filedlghelper.src
+#, fuzzy
 msgctxt ""
 "filedlghelper.src\n"
 "STR_PB_OPEN\n"
@@ -1021,6 +1040,7 @@ msgstr ""
 "झिच् (~O)"
 
 #: filedlghelper.src
+#, fuzzy
 msgctxt ""
 "filedlghelper.src\n"
 "STR_PB_SAVE\n"
@@ -1151,6 +1171,7 @@ msgid "Cancel Recording"
 msgstr ""
 
 #: srchdlg.src
+#, fuzzy
 msgctxt ""
 "srchdlg.src\n"
 "RID_DLG_SEARCH\n"
@@ -1200,6 +1221,7 @@ msgid "~Backwards"
 msgstr "तायोम सेद (~w)"
 
 #: srchdlg.src
+#, fuzzy
 msgctxt ""
 "srchdlg.src\n"
 "RID_DLG_SEARCH\n"
@@ -1217,6 +1239,7 @@ msgstr ""
 "पानते (~F)"
 
 #: srchdlg.src
+#, fuzzy
 msgctxt ""
 "srchdlg.src\n"
 "RID_DLG_SEARCH\n"
@@ -1273,6 +1296,7 @@ msgid "Undock"
 msgstr ""
 
 #: taskpane.src
+#, fuzzy
 msgctxt ""
 "taskpane.src\n"
 "STR_SFX_TASK_PANE_VIEW\n"
@@ -1299,6 +1323,7 @@ msgid "Tasks"
 msgstr "का़मी"
 
 #: templateinfodlg.src
+#, fuzzy
 msgctxt ""
 "templateinfodlg.src\n"
 "DLG_TEMPLATE_INFORMATION\n"
@@ -1322,6 +1347,7 @@ msgstr ""
 "बोंद"
 
 #: templdlg.src
+#, fuzzy
 msgctxt ""
 "templdlg.src\n"
 "STR_STYLE_ELEMTLIST\n"
@@ -1433,6 +1459,7 @@ msgid "Saved by"
 msgstr ""
 
 #: versdlg.src
+#, fuzzy
 msgctxt ""
 "versdlg.src\n"
 "DLG_VERSIONS\n"
@@ -1448,6 +1475,7 @@ msgstr ""
 "ओकता काथा को"
 
 #: versdlg.src
+#, fuzzy
 msgctxt ""
 "versdlg.src\n"
 "DLG_VERSIONS\n"
@@ -1471,6 +1499,7 @@ msgstr ""
 "बोंद"
 
 #: versdlg.src
+#, fuzzy
 msgctxt ""
 "versdlg.src\n"
 "DLG_VERSIONS\n"
@@ -1499,6 +1528,7 @@ msgid "~Show..."
 msgstr ""
 
 #: versdlg.src
+#, fuzzy
 msgctxt ""
 "versdlg.src\n"
 "DLG_VERSIONS\n"
@@ -1569,6 +1599,7 @@ msgid "Saved by "
 msgstr ""
 
 #: versdlg.src
+#, fuzzy
 msgctxt ""
 "versdlg.src\n"
 "DLG_COMMENTS\n"
diff --git a/source/sat/sfx2/source/menu.po b/source/sat/sfx2/source/menu.po
index 355696fba09..bd49111b41e 100644
--- a/source/sat/sfx2/source/menu.po
+++ b/source/sat/sfx2/source/menu.po
@@ -1,4 +1,4 @@
-#. extracted from sfx2/source/menu
+# 
 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"
 
 #: menu.src
 msgctxt ""
@@ -31,6 +31,7 @@ msgid "~Add-Ons"
 msgstr "सेलेद-ओन्स"
 
 #: menu.src
+#, fuzzy
 msgctxt ""
 "menu.src\n"
 "MN_CLIPBOARDFUNCS\n"
@@ -44,6 +45,7 @@ msgstr ""
 "गेत्   (~t)"
 
 #: menu.src
+#, fuzzy
 msgctxt ""
 "menu.src\n"
 "MN_CLIPBOARDFUNCS\n"
@@ -98,6 +100,7 @@ msgid "Synonyms"
 msgstr ""
 
 #: menu.src
+#, fuzzy
 msgctxt ""
 "menu.src\n"
 "STR_MENU_NO_SYNONYM_FOUND\n"
diff --git a/source/sat/sfx2/source/view.po b/source/sat/sfx2/source/view.po
index d74805e848d..05636f08d0b 100644
--- a/source/sat/sfx2/source/view.po
+++ b/source/sat/sfx2/source/view.po
@@ -1,4 +1,4 @@
-#. extracted from sfx2/source/view
+# 
 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"
 
 #: view.src
 msgctxt ""
@@ -45,6 +45,7 @@ msgid ""
 msgstr ""
 
 #: view.src
+#, fuzzy
 msgctxt ""
 "view.src\n"
 "STR_PRINT_OPTIONS\n"
@@ -81,6 +82,7 @@ msgid "Printing"
 msgstr "छापा काना"
 
 #: view.src
+#, fuzzy
 msgctxt ""
 "view.src\n"
 "STR_PAGE\n"