Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

3 files changed, 32 insertions, 9 deletions

diff --git a/source/dz/editeng/source/editeng.po b/source/dz/editeng/source/editeng.po
index 926dd8c1300..3e8b3af291d 100644
--- a/source/dz/editeng/source/editeng.po
+++ b/source/dz/editeng/source/editeng.po
@@ -1,4 +1,4 @@
-#. extracted from editeng/source/editeng
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,16 +7,17 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 11:05+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: dz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366023920.0\n"
 
 #: editeng.src
+#, fuzzy
 msgctxt ""
 "editeng.src\n"
 "RID_EDITUNDO_DEL\n"
@@ -49,6 +50,7 @@ msgid "Move"
 msgstr "སྤོ་ཤུད་འབད།"
 
 #: editeng.src
+#, fuzzy
 msgctxt ""
 "editeng.src\n"
 "RID_EDITUNDO_INSERT\n"
@@ -73,6 +75,7 @@ msgstr ""
 "བཙུགས།"
 
 #: editeng.src
+#, fuzzy
 msgctxt ""
 "editeng.src\n"
 "RID_EDITUNDO_REPLACE\n"
@@ -167,6 +170,7 @@ msgid "Ignore All"
 msgstr "ཆ་མཉམ་སྣང་མེད་སྦེ་བཞག"
 
 #: editeng.src
+#, fuzzy
 msgctxt ""
 "editeng.src\n"
 "RID_MENU_SPELL\n"
diff --git a/source/dz/editeng/source/items.po b/source/dz/editeng/source/items.po
index 2474a51e0a5..ff9cb25a517 100644
--- a/source/dz/editeng/source/items.po
+++ b/source/dz/editeng/source/items.po
@@ -1,4 +1,4 @@
-#. extracted from editeng/source/items
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 11:05+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: dz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366023920.0\n"
 
 #: page.src
@@ -297,6 +297,7 @@ msgid "Oblique italic"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_ITALIC_NORMAL\n"
@@ -339,6 +340,7 @@ msgid "ultra thin"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_WEIGHT_LIGHT\n"
@@ -451,6 +453,7 @@ msgid "Dotted underline"
 msgstr "འོག་ཐིག་གཉིས་ལྡན།(~u)"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_UL_DONTKNOW\n"
@@ -781,6 +784,7 @@ msgid "Strike through with Xes"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_CASEMAP_NONE\n"
@@ -835,6 +839,7 @@ msgid "Lowercase"
 msgstr "མགྱོགས་ཡིག"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_CASEMAP_TITEL\n"
@@ -961,6 +966,7 @@ msgid "Fill character:"
 msgstr "ཡིག་འབྲུ་ བཀང་།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TAB_ADJUST_LEFT\n"
@@ -985,6 +991,7 @@ msgstr ""
 "གཡོན།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TAB_ADJUST_RIGHT\n"
@@ -1009,6 +1016,7 @@ msgstr ""
 "གཡས།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TAB_ADJUST_DECIMAL\n"
@@ -1031,6 +1039,7 @@ msgid "Centered"
 msgstr "དབུས་ལུ་བཞག་ཡོདཔ།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TAB_ADJUST_DEFAULT\n"
@@ -1147,6 +1156,7 @@ msgid "3D engraved"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_INSET\n"
@@ -1171,6 +1181,7 @@ msgstr ""
 "བཙུགས།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_OUTSET\n"
@@ -1311,6 +1322,7 @@ msgid "No Outline"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_PRINT_TRUE\n"
@@ -1449,6 +1461,7 @@ msgid "Not Transparent"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_HYPHEN_TRUE\n"
@@ -1738,6 +1751,7 @@ msgid "Accent "
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_EMPHASIS_ABOVE_POS\n"
@@ -1750,6 +1764,7 @@ msgstr ""
 "ལྟག་ལུ"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_EMPHASIS_BELOW_POS\n"
@@ -2020,6 +2035,7 @@ msgid "Align left"
 msgstr "གཡོན་ཕྲང་།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_HORJUST_CENTER\n"
@@ -2072,6 +2088,7 @@ msgid "Align to top"
 msgstr "སྤྱི་ཏོག་གི་ཕྲང།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_VERJUST_CENTER\n"
@@ -2092,6 +2109,7 @@ msgid "Align to bottom"
 msgstr "གཤམ་ལུ་ཕྲང་།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_JUSTMETHOD_AUTO\n"
diff --git a/source/dz/editeng/source/outliner.po b/source/dz/editeng/source/outliner.po
index 708ef98e75b..906da98573d 100644
--- a/source/dz/editeng/source/outliner.po
+++ b/source/dz/editeng/source/outliner.po
@@ -1,4 +1,4 @@
-#. extracted from editeng/source/outliner
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-05 19:33+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: dz\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: dz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: outliner.src
 msgctxt ""
@@ -56,6 +56,7 @@ msgid "Apply attributes"
 msgstr "མངའ་ཁོངས་ཁྱད་ཆོས་ཚུ།"
 
 #: outliner.src
+#, fuzzy
 msgctxt ""
 "outliner.src\n"
 "RID_OUTLUNDO_INSERT\n"