Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

6 files changed, 37 insertions, 18 deletions

diff --git a/source/mai/sd/source/core.po b/source/mai/sd/source/core.po
index f1363ae9711..3ad1dfc8ed3 100644
--- a/source/mai/sd/source/core.po
+++ b/source/mai/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 14:58+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mai\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: mai\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"
@@ -754,6 +755,7 @@ msgid "Banding cell"
 msgstr ""
 
 #: glob.src
+#, fuzzy
 msgctxt ""
 "glob.src\n"
 "STR_POOLSHEET_HEADER\n"
diff --git a/source/mai/sd/source/ui/annotations.po b/source/mai/sd/source/ui/annotations.po
index 2d5eef87047..f6928e37a28 100644
--- a/source/mai/sd/source/ui/annotations.po
+++ b/source/mai/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-02-17 21:13+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mai\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: mai\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361135632.0\n"
 
 #: annotations.src
@@ -61,6 +61,7 @@ msgid "~Strikethrough"
 msgstr ""
 
 #: annotations.src
+#, fuzzy
 msgctxt ""
 "annotations.src\n"
 "RID_ANNOTATION_CONTEXTMENU\n"
@@ -84,6 +85,7 @@ msgstr ""
 "कॉपी करू (~C)"
 
 #: annotations.src
+#, fuzzy
 msgctxt ""
 "annotations.src\n"
 "RID_ANNOTATION_CONTEXTMENU\n"
diff --git a/source/mai/sd/source/ui/app.po b/source/mai/sd/source/ui/app.po
index 4cffb79df28..f0ad13fc5e1 100644
--- a/source/mai/sd/source/ui/app.po
+++ b/source/mai/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-02-17 21:13+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mai\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: mai\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361135632.0\n"
 
 #: menuids3_tmpl.src
@@ -1024,6 +1024,7 @@ msgid "F~ontwork"
 msgstr "फ़ॉन्टवर्क (~o)"
 
 #: menuids_tmpl.src
+#, fuzzy
 msgctxt ""
 "menuids_tmpl.src\n"
 "MN_ORIGINAL_SIZE\n"
@@ -2175,6 +2176,7 @@ msgid "Outline"
 msgstr "बाहरी रूपरेखा"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "STR_NOTES_MODE\n"
@@ -2381,6 +2383,7 @@ msgid "Nine Slides"
 msgstr ""
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "STR_AUTOLAYOUT_NOTES\n"
@@ -3633,6 +3636,7 @@ msgid "Active link"
 msgstr "क्रियाशील कड़ी"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "STR_HTMLEXP_NOTES\n"
@@ -4211,6 +4215,7 @@ msgid "Select a template from which to import page designs."
 msgstr ""
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_ANNOTATIONS_START\n"
@@ -4325,6 +4330,7 @@ msgid "Media Playback"
 msgstr "मीडिया प्लेबैक"
 
 #: toolbox.src
+#, fuzzy
 msgctxt ""
 "toolbox.src\n"
 "RID_DRAW_TABLE_TOOLBOX\n"
diff --git a/source/mai/sd/source/ui/dlg.po b/source/mai/sd/source/ui/dlg.po
index ae3c47eb54c..5078bf27dcb 100644
--- a/source/mai/sd/source/ui/dlg.po
+++ b/source/mai/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 10:16+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mai\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: mai\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1356517006.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/mai/sd/source/ui/table.po b/source/mai/sd/source/ui/table.po
index 6bc46eac8f4..f95805bd112 100644
--- a/source/mai/sd/source/ui/table.po
+++ b/source/mai/sd/source/ui/table.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/table
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 00:12+0200\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mai\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: mai\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: TableDesignPane.src
 msgctxt ""
@@ -78,6 +78,7 @@ msgid "Ba~nded Columns"
 msgstr ""
 
 #: TableDesignPane.src
+#, fuzzy
 msgctxt ""
 "TableDesignPane.src\n"
 "DLG_TABLEDESIGNPANE\n"
diff --git a/source/mai/sd/source/ui/view.po b/source/mai/sd/source/ui/view.po
index aa797297512..e1821b2e749 100644
--- a/source/mai/sd/source/ui/view.po
+++ b/source/mai/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 00:41+0200\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mai\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: mai\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"
@@ -216,6 +219,7 @@ msgid "Top to bottom, then right"
 msgstr "उप्परसँ नीच्चाँ, आओऱ दहिन्ना तरफ (~T)"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -274,6 +278,7 @@ msgid "Output options"
 msgstr ""
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -320,6 +325,7 @@ msgid "Black & white"
 msgstr "करिया आओर उज्जर (~w)"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -477,6 +483,7 @@ msgid "~Use only paper tray from printer preferences"
 msgstr ""
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"