Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

3 files changed, 38 insertions, 9 deletions

diff --git a/source/bo/editeng/source/editeng.po b/source/bo/editeng/source/editeng.po
index 093f000d2d4..0e9340fb71c 100644
--- a/source/bo/editeng/source/editeng.po
+++ b/source/bo/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-02-17 20:16+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: bo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361132189.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/bo/editeng/source/items.po b/source/bo/editeng/source/items.po
index 27fdbee514c..c9abe8580ee 100644
--- a/source/bo/editeng/source/items.po
+++ b/source/bo/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-02-17 20:16+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: bo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361132189.0\n"
 
 #: page.src
@@ -33,6 +33,7 @@ msgid "[From printer settings]"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TRUE\n"
@@ -45,6 +46,7 @@ msgstr ""
 "True"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_FALSE\n"
@@ -161,6 +163,7 @@ msgid "Color "
 msgstr "ཚོས་གཞི།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_COLOR_BLACK\n"
@@ -173,6 +176,7 @@ msgstr ""
 "ནག་པོ།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_COLOR_BLUE\n"
@@ -187,6 +191,7 @@ msgstr ""
 "སྔོན་མདོག་སྡུར་ཚད།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_COLOR_GREEN\n"
@@ -209,6 +214,7 @@ msgid "Cyan"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_COLOR_RED\n"
@@ -349,6 +355,7 @@ msgid "ultra thin"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_WEIGHT_LIGHT\n"
@@ -421,6 +428,7 @@ msgid "ultra bold"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_WEIGHT_BLACK\n"
@@ -465,6 +473,7 @@ msgid "Dotted underline"
 msgstr "ཆ་ལྡན་གཤམ་ཐིག(~U)"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_UL_DONTKNOW\n"
@@ -795,6 +804,7 @@ msgid "Strike through with Xes"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_CASEMAP_NONE\n"
@@ -841,6 +851,7 @@ msgid "Caps"
 msgstr "འཛམ་གླིང་ས་ཁྲ།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_CASEMAP_GEMEINE\n"
@@ -853,6 +864,7 @@ msgstr ""
 "ཆུང་བྲིས་ཡིག་འབྲུ།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_CASEMAP_TITEL\n"
@@ -977,6 +989,7 @@ msgid "Fill character:"
 msgstr "ཡིག་རྟགས་ཁ་སྐོང་།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TAB_ADJUST_LEFT\n"
@@ -1001,6 +1014,7 @@ msgstr ""
 "གཡོན་ལ།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TAB_ADJUST_RIGHT\n"
@@ -1025,6 +1039,7 @@ msgstr ""
 "གཡས་ལ།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TAB_ADJUST_DECIMAL\n"
@@ -1047,6 +1062,7 @@ msgid "Centered"
 msgstr "དཀྱིལ་བསྡུ།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TAB_ADJUST_DEFAULT\n"
@@ -1163,6 +1179,7 @@ msgid "3D engraved"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_INSET\n"
@@ -1307,6 +1324,7 @@ msgid "Not Words Only"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_CONTOUR_TRUE\n"
@@ -1341,6 +1359,7 @@ msgid "No Outline"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_PRINT_TRUE\n"
@@ -1479,6 +1498,7 @@ msgid "Not Transparent"
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_HYPHEN_TRUE\n"
@@ -1766,6 +1786,7 @@ msgid "Accent "
 msgstr ""
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_EMPHASIS_ABOVE_POS\n"
@@ -1778,6 +1799,7 @@ msgstr ""
 "གོང་། སྟེང་།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_EMPHASIS_BELOW_POS\n"
@@ -2112,6 +2134,7 @@ msgid "Align to bottom"
 msgstr "འོག་ཕྱོགས་ལ་བང་སྒྲིག་བྱེད།"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_JUSTMETHOD_AUTO\n"
diff --git a/source/bo/editeng/source/outliner.po b/source/bo/editeng/source/outliner.po
index 8d3eddc07ed..c87863b07bb 100644
--- a/source/bo/editeng/source/outliner.po
+++ b/source/bo/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:01+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: bo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: outliner.src
 msgctxt ""
@@ -40,6 +40,7 @@ msgid "Show subpoints"
 msgstr "འགྲེམ་པ།"
 
 #: outliner.src
+#, fuzzy
 msgctxt ""
 "outliner.src\n"
 "RID_OUTLUNDO_COLLAPSE\n"
@@ -60,6 +61,7 @@ msgid "Apply attributes"
 msgstr "ཉེར་སྤྱོད་ཀྱི་གཏོགས་གཤིབ།"
 
 #: outliner.src
+#, fuzzy
 msgctxt ""
 "outliner.src\n"
 "RID_OUTLUNDO_INSERT\n"