Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

6 files changed, 43 insertions, 18 deletions

diff --git a/source/dz/svx/source/dialog.po b/source/dz/svx/source/dialog.po
index 19771477d76..1a20e448441 100644
--- a/source/dz/svx/source/dialog.po
+++ b/source/dz/svx/source/dialog.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/dialog
+# 
 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: 1366023956.0\n"
 
 #: bmpmask.src
@@ -3091,6 +3091,7 @@ msgid "Horizontal Green"
 msgstr "ཐད་སྙམས་ནང་ན།"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT41\n"
@@ -3209,6 +3210,7 @@ msgid "Vertical Green"
 msgstr "ཀེར་ཕྲེང་ནང་ན།"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT55\n"
diff --git a/source/dz/svx/source/form.po b/source/dz/svx/source/form.po
index e9a6244f1bc..0c0110ca49c 100644
--- a/source/dz/svx/source/form.po
+++ b/source/dz/svx/source/form.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/form
+# 
 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"
 
 #: datanavi.src
 msgctxt ""
@@ -1066,6 +1066,7 @@ msgid "I~s not Null"
 msgstr "འདི་སྟོང་ཆ་མེན་པས།(~s )"
 
 #: fmexpl.src
+#, fuzzy
 msgctxt ""
 "fmexpl.src\n"
 "RID_FMEXPLORER_POPUPMENU.SID_FM_NEW\n"
@@ -1439,6 +1440,7 @@ msgid "Form Navigator"
 msgstr "འབྲི་ཤོག་འགྲུལ་བསྐྱོད།"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_STR_FORM\n"
@@ -1457,6 +1459,7 @@ msgstr ""
 "འབྲི་ཤོག"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_TABWIN_PREFIX\n"
@@ -1488,6 +1491,7 @@ msgstr ""
 "ཐིག་ཁྲམ།"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_TABWIN_PREFIX\n"
@@ -1509,6 +1513,7 @@ msgstr ""
 "འདྲི་དཔྱད།"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_TABWIN_PREFIX\n"
@@ -1522,6 +1527,7 @@ msgstr ""
 "ཨེསི་ཀིཡུ་ཨེལི།"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_STR_STDFORMNAME\n"
@@ -2087,6 +2093,7 @@ msgid "Count"
 msgstr "གྱངས་ཁ་རྐྱབས།"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_SQL_INTERNATIONAL\n"
@@ -2102,6 +2109,7 @@ msgstr ""
 "མང་མཐའ།"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_SQL_INTERNATIONAL\n"
@@ -2117,6 +2125,7 @@ msgstr ""
 "ཉུང་མཐའ།"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_RSC_SQL_INTERNATIONAL\n"
@@ -2328,6 +2337,7 @@ msgid "Data Navigator"
 msgstr "གནད་སྡུད་འགྲུལ་བསྐྱོད།"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_STR_READONLY_VIEW\n"
@@ -2340,6 +2350,7 @@ msgstr ""
 "(ལྷག་ནི་རྐྱངམ་གཅིག)"
 
 #: fmstring.src
+#, fuzzy
 msgctxt ""
 "fmstring.src\n"
 "RID_STR_ALREADYEXISTOVERWRITE\n"
diff --git a/source/dz/svx/source/gallery2.po b/source/dz/svx/source/gallery2.po
index 611e302c5cc..61cc748ba5f 100644
--- a/source/dz/svx/source/gallery2.po
+++ b/source/dz/svx/source/gallery2.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/gallery2
+# 
 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: 1356520099.0\n"
 
 #: gallery.src
@@ -1159,6 +1159,7 @@ msgid "Computer - WIFI"
 msgstr ""
 
 #: galtheme.src
+#, fuzzy
 msgctxt ""
 "galtheme.src\n"
 "RID_GALLERYSTR_THEME_NUMBERS\n"
@@ -1183,6 +1184,7 @@ msgid "Signs - danger"
 msgstr ""
 
 #: galtheme.src
+#, fuzzy
 msgctxt ""
 "galtheme.src\n"
 "RID_GALLERYSTR_THEME_OBJECTS\n"
diff --git a/source/dz/svx/source/src.po b/source/dz/svx/source/src.po
index 628c9bb3c47..b0c5f5648b1 100644
--- a/source/dz/svx/source/src.po
+++ b/source/dz/svx/source/src.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/src
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-11 23:11+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"
 
 #: app.src
 msgctxt ""
@@ -24,6 +24,7 @@ msgid "The action could not be executed. The %PRODUCTNAME program module needed
 msgstr "བྱ་བ་འདི་ ལག་ལེན་འཐབ་མི་ཚུགས།འ་ནི་བྱ་བ་གི་དོན་ལུ་ དགོ་པའི་ %PRODUCTNAME་ ལས་རིམ་ ཚད་གཞི་འདི་ ད་ལྟོ་གཞི་བཙུགས་མ་འབད་བས།"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRCTX\n"
@@ -45,6 +46,7 @@ msgstr ""
 "འཛོལ་བ་"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRCTX\n"
@@ -260,6 +262,7 @@ msgid "Action not supported"
 msgstr "བྱ་བ་རྒྱབ་སྐྱོར་མ་འབད་བས།"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRHDL\n"
@@ -390,6 +393,7 @@ msgid "Nonexistent file."
 msgstr "གནས་མེད་ཡིག་སྣོད།"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRHDL\n"
@@ -687,6 +691,7 @@ msgid "The wrong password has been entered."
 msgstr "ཆོག་ཡིག་རྫུན་མ་འདི་ཐོ་བཀོད་འབད་ནུག"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRHDL\n"
diff --git a/source/dz/svx/source/svdraw.po b/source/dz/svx/source/svdraw.po
index 5e9d61e4bd8..331c5148370 100644
--- a/source/dz/svx/source/svdraw.po
+++ b/source/dz/svx/source/svdraw.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/svdraw
+# 
 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"
 
 #: svdstr.src
 msgctxt ""
@@ -4912,6 +4912,7 @@ msgid "Table style settings"
 msgstr ""
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNameSingulTable\n"
@@ -4942,6 +4943,7 @@ msgstr ""
 "ཐིག་ཁྲམ།"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNamePluralTable\n"
@@ -4964,6 +4966,7 @@ msgstr ""
 "ཐིག་ཁྲམ།"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNameSingulFONTWORK\n"
@@ -4978,6 +4981,7 @@ msgstr ""
 "ཡིག་གཟུགས་ཀྱི་ལཱ་གཡོག"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNamePluralFONTWORK\n"
diff --git a/source/dz/svx/source/tbxctrls.po b/source/dz/svx/source/tbxctrls.po
index cff62008b2f..5910df5d3d9 100644
--- a/source/dz/svx/source/tbxctrls.po
+++ b/source/dz/svx/source/tbxctrls.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/tbxctrls
+# 
 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"
 
 #: colrctrl.src
 msgctxt ""
@@ -716,6 +716,7 @@ msgid "More..."
 msgstr "ཧེང་བཀལ།"
 
 #: tbcontrl.src
+#, fuzzy
 msgctxt ""
 "tbcontrl.src\n"
 "RID_SVXSTR_TEXTCOLOR\n"