Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

3 files changed, 33 insertions, 9 deletions

diff --git a/source/dgo/sc/source/core/src.po b/source/dgo/sc/source/core/src.po
index c2e5f96d79f..f170d19ca8f 100644
--- a/source/dgo/sc/source/core/src.po
+++ b/source/dgo/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 09:37+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"
 
 #: compiler.src
+#, fuzzy
 msgctxt ""
 "compiler.src\n"
 "RID_FUNCTION_CATEGORIES\n"
@@ -54,6 +55,7 @@ msgid "Financial"
 msgstr "माल्ली "
 
 #: compiler.src
+#, fuzzy
 msgctxt ""
 "compiler.src\n"
 "RID_FUNCTION_CATEGORIES\n"
@@ -116,6 +118,7 @@ msgid "Spreadsheet"
 msgstr "स्प्रैडशीट "
 
 #: compiler.src
+#, fuzzy
 msgctxt ""
 "compiler.src\n"
 "RID_FUNCTION_CATEGORIES\n"
@@ -151,6 +154,7 @@ msgstr ""
 "इबारत"
 
 #: compiler.src
+#, fuzzy
 msgctxt ""
 "compiler.src\n"
 "RID_FUNCTION_CATEGORIES\n"
diff --git a/source/dgo/sc/source/ui/cctrl.po b/source/dgo/sc/source/ui/cctrl.po
index 1e13bda4278..e6f3fcfde6c 100644
--- a/source/dgo/sc/source/ui/cctrl.po
+++ b/source/dgo/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 09:37+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"
 
 #: 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/dgo/sc/source/ui/src.po b/source/dgo/sc/source/ui/src.po
index bac40b01d5a..f87256284e4 100644
--- a/source/dgo/sc/source/ui/src.po
+++ b/source/dgo/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: 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"
 
 #: autofmt.src
@@ -267,6 +267,7 @@ msgid "Axis"
 msgstr " अक्षरेखा\t"
 
 #: colorformat.src
+#, fuzzy
 msgctxt ""
 "colorformat.src\n"
 "RID_SCDLG_DATABAR\n"
@@ -334,6 +335,7 @@ msgid "Automatic"
 msgstr "  स्वचलत"
 
 #: colorformat.src
+#, fuzzy
 msgctxt ""
 "colorformat.src\n"
 "RID_SCDLG_DATABAR.LB_TYPE\n"
@@ -1326,6 +1328,7 @@ msgid "Remove"
 msgstr "Remove"
 
 #: condformatmgr.src
+#, fuzzy
 msgctxt ""
 "condformatmgr.src\n"
 "RID_SCDLG_COND_FORMAT_MANAGER\n"
@@ -6604,6 +6607,7 @@ msgid "Rectangle"
 msgstr "चकुंडा"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6630,6 +6634,7 @@ msgid "Oval"
 msgstr "अंडकार\t"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6647,6 +6652,7 @@ msgstr ""
 "इबारत खान्ना "
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6662,6 +6668,7 @@ msgstr ""
 "बटन "
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6688,6 +6695,7 @@ msgid "Option Button"
 msgstr "विकल्प बटन "
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6701,6 +6709,7 @@ msgstr ""
 "लेबल "
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -6718,6 +6727,7 @@ msgstr ""
 "सूची खान्ना"
 
 #: globstr.src
+#, fuzzy
 msgctxt ""
 "globstr.src\n"
 "RID_GLOBSTR\n"
@@ -7483,6 +7493,7 @@ msgid "Cu~t"
 msgstr "कप्पो "
 
 #: hdrcont.src
+#, fuzzy
 msgctxt ""
 "hdrcont.src\n"
 "PART2\n"
@@ -7927,6 +7938,7 @@ msgid "Paste Special"
 msgstr "विशेश चमकाओ"
 
 #: miscdlgs.src
+#, fuzzy
 msgctxt ""
 "miscdlgs.src\n"
 "RID_SCDLG_MOVETAB\n"
@@ -7953,6 +7965,7 @@ msgid "~Move"
 msgstr "लेओ"
 
 #: miscdlgs.src
+#, fuzzy
 msgctxt ""
 "miscdlgs.src\n"
 "RID_SCDLG_MOVETAB\n"
@@ -8793,6 +8806,7 @@ msgid "~Delete"
 msgstr "~म्हेसो"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "RID_SCPAGE_USERLISTS\n"
@@ -9709,6 +9723,7 @@ msgid "Cu~t"
 msgstr "कप्पो "
 
 #: popup.src
+#, fuzzy
 msgctxt ""
 "popup.src\n"
 "RID_POPUP_CELLS\n"
@@ -9750,6 +9765,7 @@ msgid "P~aste Special..."
 msgstr "विशेश चमकाओ"
 
 #: popup.src
+#, fuzzy
 msgctxt ""
 "popup.src\n"
 "RID_POPUP_CELLS.SID_PASTE_ONLY\n"
@@ -24961,6 +24977,7 @@ msgstr ""
 " क्या तुस सच्चें गै मजूद डेटे गी ओवरराइट करना चांह‌दे ओ? "
 
 #: scstring.src
+#, fuzzy
 msgctxt ""
 "scstring.src\n"
 "SCSTR_ALLFILTER\n"
@@ -25191,6 +25208,7 @@ msgid "(read-only)"
 msgstr "(सिर्फ पढ़न जोग) "
 
 #: scstring.src
+#, fuzzy
 msgctxt ""
 "scstring.src\n"
 "STR_ACC_DOC_PREVIEW_SUFFIX\n"
@@ -25427,6 +25445,7 @@ msgid "Settings:"
 msgstr "सैट्टिंगां"
 
 #: solveroptions.src
+#, fuzzy
 msgctxt ""
 "solveroptions.src\n"
 "RID_SCDLG_SOLVEROPTIONS\n"