Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

4 files changed, 86 insertions, 12 deletions

diff --git a/source/dgo/wizards/source/euro.po b/source/dgo/wizards/source/euro.po
index d3d7ae867c6..b7a6177a5e6 100644
--- a/source/dgo/wizards/source/euro.po
+++ b/source/dgo/wizards/source/euro.po
@@ -1,4 +1,4 @@
-#. extracted from wizards/source/euro
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,14 +7,15 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 09:40+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: dgo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: dgo\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: euro.src
+#, fuzzy
 msgctxt ""
 "euro.src\n"
 "STEP_ZERO\n"
@@ -27,6 +28,7 @@ msgstr ""
 "~ रद्द करो "
 
 #: euro.src
+#, fuzzy
 msgctxt ""
 "euro.src\n"
 "STEP_ZERO + 1\n"
@@ -107,6 +109,7 @@ msgid "~Entire document"
 msgstr "सारा दस्तावेज "
 
 #: euro.src
+#, fuzzy
 msgctxt ""
 "euro.src\n"
 "STEP_CONVERTER + 1\n"
@@ -317,6 +320,7 @@ msgid "Conversion of the currency units in the cell templates..."
 msgstr ""
 
 #: euro.src
+#, fuzzy
 msgctxt ""
 "euro.src\n"
 "MESSAGES\n"
@@ -467,6 +471,7 @@ msgid "OK"
 msgstr "ठीक ऐ "
 
 #: euro.src
+#, fuzzy
 msgctxt ""
 "euro.src\n"
 "MESSAGES + 18\n"
diff --git a/source/dgo/wizards/source/formwizard.po b/source/dgo/wizards/source/formwizard.po
index 84ca100e71d..c92b93511bb 100644
--- a/source/dgo/wizards/source/formwizard.po
+++ b/source/dgo/wizards/source/formwizard.po
@@ -1,4 +1,4 @@
-#. extracted from wizards/source/formwizard
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-06-20 12:29+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: dgo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: dgo\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1340195399.0\n"
 
 #: dbwizres.src
@@ -96,6 +96,7 @@ msgid "Yes to All"
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_COMMON_START + 10\n"
@@ -114,6 +115,7 @@ msgstr ""
 "नेईं "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_COMMON_START + 11\n"
@@ -128,6 +130,7 @@ msgstr ""
 "रद्द करो "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_COMMON_START + 12\n"
@@ -150,6 +153,7 @@ msgid "< ~Back"
 msgstr "< ~पिच्छें "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_COMMON_START + 14\n"
@@ -184,6 +188,7 @@ msgid "Steps"
 msgstr "~चरण(बहु.)"
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_COMMON_START + 17\n"
@@ -251,6 +256,7 @@ msgid "C~reate"
 msgstr "सिरजो "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_COMMON_START + 1\n"
@@ -263,6 +269,7 @@ msgstr ""
 "~ रद्द करो "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_COMMON_START + 2\n"
@@ -277,6 +284,7 @@ msgstr ""
 "<< पिच्छें"
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_COMMON_START + 3\n"
@@ -295,6 +303,7 @@ msgstr ""
 "~अगला >>"
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_COMMON_START + 4\n"
@@ -339,6 +348,7 @@ msgid "~Help"
 msgstr "~मदद "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_COMMON_START + 21\n"
@@ -1009,6 +1019,7 @@ msgid "Query Wizard"
 msgstr "पुच्छ विशारद...\t\t"
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_QUERY_WIZARD_START + 1\n"
@@ -1131,6 +1142,7 @@ msgid "Fields"
 msgstr "खेतर (बहु․) "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_QUERY_WIZARD_START + 18\n"
@@ -1151,6 +1163,7 @@ msgid "Field"
 msgstr "खेतर "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_QUERY_WIZARD_START + 20\n"
@@ -1179,6 +1192,7 @@ msgid "Query: "
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_QUERY_WIZARD_START + 24\n"
@@ -1295,6 +1309,7 @@ msgid "false"
 msgstr "गल्त"
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_QUERY_WIZARD_START + 38\n"
@@ -1599,6 +1614,7 @@ msgid "Aliases"
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_QUERY_WIZARD_START + 87\n"
@@ -1803,6 +1819,7 @@ msgid "T~hen by"
 msgstr "  फ्ही आसेआ "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_REPORT_WIZARD_START + 22\n"
@@ -1895,6 +1912,7 @@ msgid "Create report"
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_REPORT_WIZARD_START + 36\n"
@@ -1909,6 +1927,7 @@ msgstr ""
 " चढ़दा\t"
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_REPORT_WIZARD_START + 37\n"
@@ -1987,6 +2006,7 @@ msgid "~Then by"
 msgstr "  फ्ही आसेआ "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_REPORT_WIZARD_START + 53\n"
@@ -2001,6 +2021,7 @@ msgstr ""
 " चढ़दा\t"
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_REPORT_WIZARD_START + 54\n"
@@ -2015,6 +2036,7 @@ msgstr ""
 " चढ़दा\t"
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_REPORT_WIZARD_START + 55\n"
@@ -2029,6 +2051,7 @@ msgstr ""
 " चढ़दा\t"
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_REPORT_WIZARD_START + 56\n"
@@ -2043,6 +2066,7 @@ msgstr ""
 "घटदा\t"
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_REPORT_WIZARD_START + 57\n"
@@ -2057,6 +2081,7 @@ msgstr ""
 "घटदा\t"
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_REPORT_WIZARD_START + 58\n"
@@ -2151,6 +2176,7 @@ msgid "How do you want to label the fields?"
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_REPORT_WIZARD_START + 70\n"
@@ -2291,6 +2317,7 @@ msgid "Author:"
 msgstr "लेखकः "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_DB_REPORT_WIZARD_START + 88\n"
@@ -2984,6 +3011,7 @@ msgid "Letter Wizard"
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_LETTERWIZARDDIALOG_START + 2\n"
@@ -3236,6 +3264,7 @@ msgid "~Height:"
 msgstr "उंचाई: "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_LETTERWIZARDDIALOG_START + 33\n"
@@ -3272,6 +3301,7 @@ msgid "Height:"
 msgstr "उंचाई: "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_LETTERWIZARDDIALOG_START + 37\n"
@@ -3620,6 +3650,7 @@ msgid "Fax Wizard"
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_FAXWIZARDDIALOG_START + 2\n"
@@ -3888,6 +3919,7 @@ msgid "~Include page number"
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_FAXWIZARDDIALOG_START + 35\n"
@@ -4209,6 +4241,7 @@ msgid ""
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_WEBWIZARDDIALOG_START +4\n"
@@ -4347,6 +4380,7 @@ msgid "Copyright notice:"
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_WEBWIZARDDIALOG_START +22\n"
@@ -4359,6 +4393,7 @@ msgstr ""
 "तरमीमशुदा: "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_WEBWIZARDDIALOG_START +24\n"
@@ -4469,6 +4504,7 @@ msgid "Web site content "
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_WEBWIZARDDIALOG_START +38\n"
@@ -4557,6 +4593,7 @@ msgid "~Last change date"
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_WEBWIZARDDIALOG_START +54\n"
@@ -4881,6 +4918,7 @@ msgid "Other..."
 msgstr "~बाकी दूआ... "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_WEBWIZARDDIALOG_START +103\n"
@@ -5109,6 +5147,7 @@ msgid "Web site information"
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_WEBWIZARDDIALOG_START +128\n"
@@ -5578,6 +5617,7 @@ msgid "This wizard helps you to create an agenda template. The template can then
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_AGENDAWIZARDDIALOG_START +14\n"
@@ -5782,6 +5822,7 @@ msgid "The agenda template will include placeholders for the selected items."
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_AGENDAWIZARDDIALOG_START +38\n"
@@ -5862,6 +5903,7 @@ msgid "Name"
 msgstr "नांऽ "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_AGENDAWIZARDDIALOG_START +45\n"
@@ -5894,6 +5936,7 @@ msgstr ""
 "तरीक "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_AGENDAWIZARDDIALOG_START +46\n"
@@ -5962,6 +6005,7 @@ msgid "Headings to include"
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_AGENDAWIZARDDIALOG_START +53\n"
@@ -6086,6 +6130,7 @@ msgid "Facility personnel"
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_AGENDAWIZARDDIALOG_START +68\n"
@@ -6132,6 +6177,7 @@ msgid "Move down"
 msgstr "खल्ल लेओ "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_AGENDAWIZARDDIALOG_START +72\n"
@@ -6164,6 +6210,7 @@ msgstr ""
 "तरीक "
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_AGENDAWIZARDDIALOG_START +73\n"
@@ -6232,6 +6279,7 @@ msgid "Responsible"
 msgstr ""
 
 #: dbwizres.src
+#, fuzzy
 msgctxt ""
 "dbwizres.src\n"
 "RID_AGENDAWIZARDDIALOG_START +79\n"
diff --git a/source/dgo/wizards/source/importwizard.po b/source/dgo/wizards/source/importwizard.po
index a21fc0093ab..5db083ca60c 100644
--- a/source/dgo/wizards/source/importwizard.po
+++ b/source/dgo/wizards/source/importwizard.po
@@ -1,4 +1,4 @@
-#. extracted from wizards/source/importwizard
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,15 +7,16 @@ msgstr ""
 "PO-Revision-Date: 2012-06-20 12:29+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: dgo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: dgo\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1340195399.0\n"
 
 #: importwi.src
+#, fuzzy
 msgctxt ""
 "importwi.src\n"
 "sHelpButton\n"
@@ -32,6 +33,7 @@ msgstr ""
 "~मदद"
 
 #: importwi.src
+#, fuzzy
 msgctxt ""
 "importwi.src\n"
 "sCancelButton\n"
@@ -44,6 +46,7 @@ msgstr ""
 "~ रद्द करो "
 
 #: importwi.src
+#, fuzzy
 msgctxt ""
 "importwi.src\n"
 "sBackButton\n"
@@ -74,6 +77,7 @@ msgid "~Convert"
 msgstr "~रूपांतरत करो\t"
 
 #: importwi.src
+#, fuzzy
 msgctxt ""
 "importwi.src\n"
 "sCloseButton\n"
@@ -216,6 +220,7 @@ msgid "Progress: "
 msgstr "प्रगति "
 
 #: importwi.src
+#, fuzzy
 msgctxt ""
 "importwi.src\n"
 "sProgressOneDoc\n"
@@ -236,6 +241,7 @@ msgstr ""
 "दस्तावेज"
 
 #: importwi.src
+#, fuzzy
 msgctxt ""
 "importwi.src\n"
 "sProgressMoreDocs\n"
@@ -252,6 +258,7 @@ msgstr ""
 "दस्तावेज (बहु.)"
 
 #: importwi.src
+#, fuzzy
 msgctxt ""
 "importwi.src\n"
 "sProgressMoreTemplates\n"
@@ -362,6 +369,7 @@ msgid "An unexpected error has occurred in the wizard."
 msgstr ""
 
 #: importwi.src
+#, fuzzy
 msgctxt ""
 "importwi.src\n"
 "sRTErrorHeader\n"
diff --git a/source/dgo/wizards/source/template.po b/source/dgo/wizards/source/template.po
index e46e0d15613..3c45764fed0 100644
--- a/source/dgo/wizards/source/template.po
+++ b/source/dgo/wizards/source/template.po
@@ -1,4 +1,4 @@
-#. extracted from wizards/source/template
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 09:40+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: dgo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: dgo\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: template.src
 msgctxt ""
@@ -47,6 +47,7 @@ msgid "Error while saving the document to the clipboard! The following action ca
 msgstr ""
 
 #: template.src
+#, fuzzy
 msgctxt ""
 "template.src\n"
 "STYLES + 2\n"
@@ -275,6 +276,7 @@ msgid "An error has occurred."
 msgstr ""
 
 #: template.src
+#, fuzzy
 msgctxt ""
 "template.src\n"
 "CorrespondenceDialog\n"
@@ -319,6 +321,7 @@ msgid "Click placeholder and overwrite"
 msgstr ""
 
 #: template.src
+#, fuzzy
 msgctxt ""
 "template.src\n"
 "CorrespondenceFields+1\n"
@@ -343,6 +346,7 @@ msgid "Department"
 msgstr "विभाग "
 
 #: template.src
+#, fuzzy
 msgctxt ""
 "template.src\n"
 "CorrespondenceFields+3\n"
@@ -357,6 +361,7 @@ msgstr ""
 "पैह्‌ला नांऽ "
 
 #: template.src
+#, fuzzy
 msgctxt ""
 "template.src\n"
 "CorrespondenceFields+4\n"
@@ -371,6 +376,7 @@ msgstr ""
 "खीरी नांऽ"
 
 #: template.src
+#, fuzzy
 msgctxt ""
 "template.src\n"
 "CorrespondenceFields+5\n"
@@ -401,6 +407,7 @@ msgid "ZIP/Postal Code"
 msgstr "ZIP/डाकी(घर) "
 
 #: template.src
+#, fuzzy
 msgctxt ""
 "template.src\n"
 "CorrespondenceFields+8\n"
@@ -415,6 +422,7 @@ msgstr ""
 "शैह्‌र "
 
 #: template.src
+#, fuzzy
 msgctxt ""
 "template.src\n"
 "CorrespondenceFields+9\n"
@@ -441,6 +449,7 @@ msgstr ""
 "शीर्शक "
 
 #: template.src
+#, fuzzy
 msgctxt ""
 "template.src\n"
 "CorrespondenceFields+10\n"
@@ -501,6 +510,7 @@ msgid "Work Phone"
 msgstr ""
 
 #: template.src
+#, fuzzy
 msgctxt ""
 "template.src\n"
 "CorrespondenceFields+16\n"
@@ -523,6 +533,7 @@ msgid "E-Mail"
 msgstr ""
 
 #: template.src
+#, fuzzy
 msgctxt ""
 "template.src\n"
 "CorrespondenceFields+18\n"
@@ -543,6 +554,7 @@ msgstr ""
 "URL "
 
 #: template.src
+#, fuzzy
 msgctxt ""
 "template.src\n"
 "CorrespondenceFields+19\n"
@@ -691,6 +703,7 @@ msgid "Brochure layout"
 msgstr ""
 
 #: template.src
+#, fuzzy
 msgctxt ""
 "template.src\n"
 "Newsletter + 10\n"