Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

6 files changed, 34 insertions, 18 deletions

diff --git a/source/bo/sw/source/core/unocore.po b/source/bo/sw/source/core/unocore.po
index e6fd5bc8afc..1dacd63014e 100644
--- a/source/bo/sw/source/core/unocore.po
+++ b/source/bo/sw/source/core/unocore.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/core/unocore
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-05 19:03+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"
 
 #: unocore.src
 msgctxt ""
@@ -32,6 +32,7 @@ msgid "Column %COLUMNLETTER"
 msgstr "སྟར་པ། %COLUMNNUMBER"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_CHARACTER\n"
@@ -56,6 +57,7 @@ msgstr ""
 "ཡིག་རྟགས།"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_PARAGRAPH\n"
@@ -74,6 +76,7 @@ msgstr ""
 "དུམ་ཚན།"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_FRAME\n"
@@ -90,6 +93,7 @@ msgstr ""
 "སྒྲོམ།"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_PAGE\n"
@@ -110,6 +114,7 @@ msgstr ""
 "ཤོག་ལྷེ།"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_NUMBERING\n"
diff --git a/source/bo/sw/source/ui/app.po b/source/bo/sw/source/ui/app.po
index 27b7c97eaf2..c85fe05e438 100644
--- a/source/bo/sw/source/ui/app.po
+++ b/source/bo/sw/source/ui/app.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/app
+# 
 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"
 
 #: app.src
@@ -1490,6 +1490,7 @@ msgid "Subscript"
 msgstr "གཤམ་རྟགས།"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_TEXT_ATTR\n"
@@ -1651,6 +1652,7 @@ msgid "Clear ~Direct Formatting"
 msgstr ""
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "_NUMBERING_RELATED_MENU\n"
@@ -1664,6 +1666,7 @@ msgstr ""
 "ཨང་སྒྲིག་བསྐྱར་དུ་འགོ་འཛུགས་པ།"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "_NUMBERING_RELATED_MENU\n"
@@ -1677,6 +1680,7 @@ msgstr ""
 "གོང་གི་ཨང་ཀི་མུ་མཐུད་སྒྲིག་རྒྱུ།"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "_NUMBERING_RELATED_MENU\n"
diff --git a/source/bo/sw/source/ui/config.po b/source/bo/sw/source/ui/config.po
index 3633a0ba93a..a0a9412e1fa 100644
--- a/source/bo/sw/source/ui/config.po
+++ b/source/bo/sw/source/ui/config.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/config
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 13:29+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"
 
 #: mailconfigpage.src
 msgctxt ""
@@ -1288,6 +1288,7 @@ msgid "Pa~ges"
 msgstr "ཤོག་ལྷེ།"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
@@ -1846,6 +1847,7 @@ msgid "Char"
 msgstr ""
 
 #: optload.src
+#, fuzzy
 msgctxt ""
 "optload.src\n"
 "STR_ARR_METRIC\n"
diff --git a/source/bo/sw/source/ui/docvw.po b/source/bo/sw/source/ui/docvw.po
index 17359faecff..9486b764d73 100644
--- a/source/bo/sw/source/ui/docvw.po
+++ b/source/bo/sw/source/ui/docvw.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/docvw
+# 
 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"
 
 #: access.src
@@ -137,6 +137,7 @@ msgid "Author"
 msgstr "རྩོམ་པ་པོ།"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_ANNOTATION_DATE_NAME\n"
@@ -213,6 +214,7 @@ msgid "%PRODUCTNAME Document"
 msgstr "%PRODUCTNAMEཡིག་ཚགས།"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_DOC_WORDPROCESSING_READONLY\n"
diff --git a/source/bo/sw/source/ui/fldui.po b/source/bo/sw/source/ui/fldui.po
index 181d4f2b94b..234bb08af43 100644
--- a/source/bo/sw/source/ui/fldui.po
+++ b/source/bo/sw/source/ui/fldui.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/fldui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-12-26 10:43+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: 1356518622.0\n"
 
 #: flddb.src
@@ -1067,6 +1067,7 @@ msgid "Street"
 msgstr "ཁྲོམ་གཞུང་།"
 
 #: fldui.src
+#, fuzzy
 msgctxt ""
 "fldui.src\n"
 "FLD_EU_LAND\n"
diff --git a/source/bo/sw/source/ui/index.po b/source/bo/sw/source/ui/index.po
index ed34d0b3b0e..ee14035281f 100644
--- a/source/bo/sw/source/ui/index.po
+++ b/source/bo/sw/source/ui/index.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/index
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-01-05 12:20+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"
 
 #: cnttab.src
 msgctxt ""
@@ -1247,6 +1247,7 @@ msgid "Assignment"
 msgstr "གཏན་འཁེལ།"
 
 #: cnttab.src
+#, fuzzy
 msgctxt ""
 "cnttab.src\n"
 "DLG_ADD_IDX_STYLES\n"
@@ -1272,6 +1273,7 @@ msgstr ""
 "གཡོན་ལ།"
 
 #: cnttab.src
+#, fuzzy
 msgctxt ""
 "cnttab.src\n"
 "DLG_ADD_IDX_STYLES\n"