Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

8 files changed, 45 insertions, 24 deletions

diff --git a/source/dz/sw/source/core/undo.po b/source/dz/sw/source/core/undo.po
index 47a041882cb..d6c12b716b3 100644
--- a/source/dz/sw/source/core/undo.po
+++ b/source/dz/sw/source/core/undo.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/core/undo
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 11:06+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: 1366023960.0\n"
 
 #: undo.src
@@ -465,6 +465,7 @@ msgid "Reject change: $1"
 msgstr ""
 
 #: undo.src
+#, fuzzy
 msgctxt ""
 "undo.src\n"
 "STR_SPLIT_TABLE\n"
@@ -773,6 +774,7 @@ msgid "insert URL button"
 msgstr ""
 
 #: undo.src
+#, fuzzy
 msgctxt ""
 "undo.src\n"
 "STR_INSERT_URLTXT\n"
@@ -1137,6 +1139,7 @@ msgid "field"
 msgstr "ས་སྒོ།"
 
 #: undo.src
+#, fuzzy
 msgctxt ""
 "undo.src\n"
 "STR_PARAGRAPHS\n"
@@ -1253,6 +1256,7 @@ msgid "table: $1$2$3"
 msgstr ""
 
 #: undo.src
+#, fuzzy
 msgctxt ""
 "undo.src\n"
 "STR_PARAGRAPH_UNDO\n"
diff --git a/source/dz/sw/source/core/unocore.po b/source/dz/sw/source/core/unocore.po
index ae005c28166..f5ebef2f76e 100644
--- a/source/dz/sw/source/core/unocore.po
+++ b/source/dz/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:35+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"
 
 #: 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"
@@ -82,6 +84,7 @@ msgid "Frame"
 msgstr "གཞི་ཁྲམ།"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_PAGE\n"
@@ -102,6 +105,7 @@ msgstr ""
 "ཤོག་ལེབ་ཚུ།"
 
 #: unocore.src
+#, fuzzy
 msgctxt ""
 "unocore.src\n"
 "STR_STYLE_FAMILY_NUMBERING\n"
diff --git a/source/dz/sw/source/ui/app.po b/source/dz/sw/source/ui/app.po
index f677a8d2f2f..b4aecb8010b 100644
--- a/source/dz/sw/source/ui/app.po
+++ b/source/dz/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-04-15 11:06+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: 1366023961.0\n"
 
 #: app.src
@@ -1489,6 +1489,7 @@ msgid "Subscript"
 msgstr "འོག་ཡིག"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_TEXT_ATTR\n"
@@ -1506,6 +1507,7 @@ msgstr ""
 "བཟོ་རྣམ།(~y)"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "MN_TEXT_ATTR.MN_FORMAT_ALGN\n"
@@ -1656,6 +1658,7 @@ msgid "Clear ~Direct Formatting"
 msgstr ""
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "_NUMBERING_RELATED_MENU\n"
@@ -1669,6 +1672,7 @@ msgstr ""
 "ཨང་གྲངས་བཏགས་ནི་  ལོག་འགོ་བཙུགས།"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "_NUMBERING_RELATED_MENU\n"
@@ -1682,6 +1686,7 @@ msgstr ""
 "ཧེ་མའི་ཨང་བཏགས་ནི་འདི་འཕྲ་མཐུད་འབད་"
 
 #: mn.src
+#, fuzzy
 msgctxt ""
 "mn.src\n"
 "_NUMBERING_RELATED_MENU\n"
diff --git a/source/dz/sw/source/ui/config.po b/source/dz/sw/source/ui/config.po
index 9b91b409b01..07abbe71a51 100644
--- a/source/dz/sw/source/ui/config.po
+++ b/source/dz/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:49+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"
 
 #: mailconfigpage.src
 msgctxt ""
@@ -1288,6 +1288,7 @@ msgid "Pa~ges"
 msgstr "ཤོག་ལེབ་ཚུ།"
 
 #: optdlg.src
+#, fuzzy
 msgctxt ""
 "optdlg.src\n"
 "STR_PRINTOPTUI\n"
diff --git a/source/dz/sw/source/ui/dbui.po b/source/dz/sw/source/ui/dbui.po
index 3e1e3a7f2ab..5ff1df68cba 100644
--- a/source/dz/sw/source/ui/dbui.po
+++ b/source/dz/sw/source/ui/dbui.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/dbui
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-12-26 11:08+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: 1356520125.0\n"
 
 #: addresslistdialog.src
@@ -2315,6 +2315,7 @@ msgid "Sen~d as"
 msgstr "བཟུམ་སྦེ་གཏང་།(~d)"
 
 #: mmoutputpage.src
+#, fuzzy
 msgctxt ""
 "mmoutputpage.src\n"
 "DLG_MM_OUTPUT_PAGE\n"
diff --git a/source/dz/sw/source/ui/docvw.po b/source/dz/sw/source/ui/docvw.po
index 28b87950192..79897ee948b 100644
--- a/source/dz/sw/source/ui/docvw.po
+++ b/source/dz/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-04-15 11:06+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: 1366023963.0\n"
 
 #: access.src
@@ -137,6 +137,7 @@ msgid "Author"
 msgstr "རྩོམ་པ་པོ།"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_ANNOTATION_DATE_NAME\n"
@@ -195,6 +196,7 @@ msgid "Document preview"
 msgstr "ཡིག་ཆ་སྟོན་ནི།"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_PREVIEW_DOC_SUFFIX\n"
@@ -215,6 +217,7 @@ msgid "%PRODUCTNAME Document"
 msgstr "%PRODUCTNAME  ཡིག་ཆ་ཚུ།"
 
 #: access.src
+#, fuzzy
 msgctxt ""
 "access.src\n"
 "STR_ACCESS_DOC_WORDPROCESSING_READONLY\n"
diff --git a/source/dz/sw/source/ui/index.po b/source/dz/sw/source/ui/index.po
index 8750cd783a7..3c6814e01ae 100644
--- a/source/dz/sw/source/ui/index.po
+++ b/source/dz/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:39+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"
 
 #: 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"
diff --git a/source/dz/sw/source/ui/lingu.po b/source/dz/sw/source/ui/lingu.po
index 3253bab5767..cf9169b6f42 100644
--- a/source/dz/sw/source/ui/lingu.po
+++ b/source/dz/sw/source/ui/lingu.po
@@ -1,4 +1,4 @@
-#. extracted from sw/source/ui/lingu
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 13:49+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"
 
 #: olmenu.src
 msgctxt ""
@@ -127,6 +127,7 @@ msgid "Reset to Default Language"
 msgstr ""
 
 #: olmenu.src
+#, fuzzy
 msgctxt ""
 "olmenu.src\n"
 "STR_LANGSTATUS_MORE\n"