Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

7 files changed, 42 insertions, 21 deletions

diff --git a/source/sat/sd/source/core.po b/source/sat/sd/source/core.po
index 0a3059451c6..3d9f2c9f971 100644
--- a/source/sat/sd/source/core.po
+++ b/source/sat/sd/source/core.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/core
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-12-15 16:09+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"
 
 #: glob.src
 msgctxt ""
@@ -587,6 +587,7 @@ msgid "Media Playback"
 msgstr "मीडिया प्लेबैक"
 
 #: glob.src
+#, fuzzy
 msgctxt ""
 "glob.src\n"
 "STR_TABLEOBJECTBARSHELL\n"
@@ -750,6 +751,7 @@ msgid "Banding cell"
 msgstr ""
 
 #: glob.src
+#, fuzzy
 msgctxt ""
 "glob.src\n"
 "STR_POOLSHEET_HEADER\n"
diff --git a/source/sat/sd/source/ui/annotations.po b/source/sat/sd/source/ui/annotations.po
index f7bcae239d9..4dcda7193bb 100644
--- a/source/sat/sd/source/ui/annotations.po
+++ b/source/sat/sd/source/ui/annotations.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/annotations
+# 
 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: 1366028186.0\n"
 
 #: annotations.src
@@ -61,6 +61,7 @@ msgid "~Strikethrough"
 msgstr ""
 
 #: annotations.src
+#, fuzzy
 msgctxt ""
 "annotations.src\n"
 "RID_ANNOTATION_CONTEXTMENU\n"
@@ -82,6 +83,7 @@ msgstr ""
 "नोकोल  (~C)"
 
 #: annotations.src
+#, fuzzy
 msgctxt ""
 "annotations.src\n"
 "RID_ANNOTATION_CONTEXTMENU\n"
diff --git a/source/sat/sd/source/ui/app.po b/source/sat/sd/source/ui/app.po
index 957bccdbbc8..72deebce665 100644
--- a/source/sat/sd/source/ui/app.po
+++ b/source/sat/sd/source/ui/app.po
@@ -1,4 +1,4 @@
-#. extracted from sd/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: 1366028187.0\n"
 
 #: menuids3_tmpl.src
@@ -1231,6 +1231,7 @@ msgid "~Snap Lines"
 msgstr "तुलाव गार(~S)"
 
 #: menuids_tmpl.src
+#, fuzzy
 msgctxt ""
 "menuids_tmpl.src\n"
 "MN_CONTROL_SHOW_BROWSER\n"
@@ -2097,6 +2098,7 @@ msgid "Cut"
 msgstr "काटो"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "STR_UNDO_REPLACE\n"
@@ -4203,6 +4205,7 @@ msgid "Select a template from which to import page designs."
 msgstr ""
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_ANNOTATIONS_START\n"
@@ -4305,6 +4308,7 @@ msgid "Function Bar (viewing mode)"
 msgstr "का़मी हुरका़ड़ एहोप्/ बोंद"
 
 #: toolbox.src
+#, fuzzy
 msgctxt ""
 "toolbox.src\n"
 "RID_DRAW_MEDIA_TOOLBOX\n"
@@ -4317,6 +4321,7 @@ msgstr ""
 "मीडिया प्लेबैक"
 
 #: toolbox.src
+#, fuzzy
 msgctxt ""
 "toolbox.src\n"
 "RID_DRAW_TABLE_TOOLBOX\n"
diff --git a/source/sat/sd/source/ui/dlg.po b/source/sat/sd/source/ui/dlg.po
index 5a7f462b5cc..835605e0df7 100644
--- a/source/sat/sd/source/ui/dlg.po
+++ b/source/sat/sd/source/ui/dlg.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/dlg
+# 
 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: 1356519600.0\n"
 
 #: PaneDockingWindow.src
@@ -882,6 +882,7 @@ msgid "~Create"
 msgstr "तेयार मे(~C)"
 
 #: dlgass.src
+#, fuzzy
 msgctxt ""
 "dlgass.src\n"
 "DLG_ASS\n"
diff --git a/source/sat/sd/source/ui/slideshow.po b/source/sat/sd/source/ui/slideshow.po
index 4c37eb2e989..d7518cb1819 100644
--- a/source/sat/sd/source/ui/slideshow.po
+++ b/source/sat/sd/source/ui/slideshow.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/slideshow
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,14 +7,15 @@ msgstr ""
 "PO-Revision-Date: 2011-12-15 16:09+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"
 
 #: slideshow.src
+#, fuzzy
 msgctxt ""
 "slideshow.src\n"
 "RID_SLIDESHOW_CONTEXTMENU\n"
diff --git a/source/sat/sd/source/ui/table.po b/source/sat/sd/source/ui/table.po
index ce8f8d17ad7..a781c3ddd03 100644
--- a/source/sat/sd/source/ui/table.po
+++ b/source/sat/sd/source/ui/table.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/table
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,14 +7,15 @@ 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"
 
 #: TableDesignPane.src
+#, fuzzy
 msgctxt ""
 "TableDesignPane.src\n"
 "DLG_TABLEDESIGNPANE\n"
@@ -84,6 +85,7 @@ msgid "Ba~nded Columns"
 msgstr ""
 
 #: TableDesignPane.src
+#, fuzzy
 msgctxt ""
 "TableDesignPane.src\n"
 "DLG_TABLEDESIGNPANE\n"
diff --git a/source/sat/sd/source/ui/view.po b/source/sat/sd/source/ui/view.po
index 4d46721520b..84f9834a27f 100644
--- a/source/sat/sd/source/ui/view.po
+++ b/source/sat/sd/source/ui/view.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/view
+# 
 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"
 
 #: DocumentRenderer.src
 msgctxt ""
@@ -33,6 +33,7 @@ msgid "Print content"
 msgstr "बिसोय लिसटी"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -77,6 +78,7 @@ msgid "Handouts"
 msgstr "ती ते ओलाक् कागोज"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_CONTENT_CHOICES\n"
@@ -92,6 +94,7 @@ msgstr ""
 "खाटो बिचा़र"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_CONTENT_CHOICES\n"
@@ -126,6 +129,7 @@ msgid "Slides per page"
 msgstr "साहटा थार गार"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES\n"
@@ -195,6 +199,7 @@ msgid "9"
 msgstr ""
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -300,6 +305,7 @@ msgid "Original colors"
 msgstr ""
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_QUALITY_CHOICES\n"
@@ -324,6 +330,7 @@ msgid "Black & white"
 msgstr "हेंदे पुंड (~W)"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -481,6 +488,7 @@ msgid "~Use only paper tray from printer preferences"
 msgstr ""
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"