Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

6 files changed, 33 insertions, 18 deletions

diff --git a/source/bo/svx/source/dialog.po b/source/bo/svx/source/dialog.po
index 33f8aeb8027..d694725a8d1 100644
--- a/source/bo/svx/source/dialog.po
+++ b/source/bo/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-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"
 
 #: bmpmask.src
@@ -3065,6 +3065,7 @@ msgid "From the Middle, Violet"
 msgstr "གཡོན་སྟོད་ནས།"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT38\n"
@@ -3101,6 +3102,7 @@ msgid "Horizontal Green"
 msgstr "གོང་འོག་ནས་དབུས་སུ་བསྡུ་འཁུམ།"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT41\n"
@@ -3115,6 +3117,7 @@ msgstr ""
 "ཆུ་སྙོམས་ཐིག་སྐུད།"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT42\n"
@@ -3231,6 +3234,7 @@ msgid "Vertical Green"
 msgstr "གཡོན་གཡས་ནས་དབུས་སུ་བསྡུ་འཁུམ།"
 
 #: sdstring.src
+#, fuzzy
 msgctxt ""
 "sdstring.src\n"
 "RID_SVXSTR_GRDT55\n"
diff --git a/source/bo/svx/source/form.po b/source/bo/svx/source/form.po
index 8a3ee046b3a..0db59abdf91 100644
--- a/source/bo/svx/source/form.po
+++ b/source/bo/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:02+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"
 
 #: datanavi.src
 msgctxt ""
@@ -2330,6 +2330,7 @@ msgid "Alignment"
 msgstr "སྙོམ་གཤིབ་ཐབས་ཚུལ།"
 
 #: formshell.src
+#, fuzzy
 msgctxt ""
 "formshell.src\n"
 "RID_SVXDLG_TEXTCONTROL_PARAATTR.1\n"
diff --git a/source/bo/svx/source/gallery2.po b/source/bo/svx/source/gallery2.po
index d78ca42668c..a058632eb20 100644
--- a/source/bo/svx/source/gallery2.po
+++ b/source/bo/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 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: 1356518589.0\n"
 
 #: gallery.src
@@ -1155,6 +1155,7 @@ msgid "Computer - WIFI"
 msgstr ""
 
 #: galtheme.src
+#, fuzzy
 msgctxt ""
 "galtheme.src\n"
 "RID_GALLERYSTR_THEME_NUMBERS\n"
diff --git a/source/bo/svx/source/src.po b/source/bo/svx/source/src.po
index 81c31034d3b..d2710f61c75 100644
--- a/source/bo/svx/source/src.po
+++ b/source/bo/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:07+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"
 
 #: 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"
@@ -282,6 +285,7 @@ msgid "Write Error"
 msgstr "འབྲི་བཅུག་ནོར་བ།"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRHDL\n"
@@ -394,6 +398,7 @@ msgid "Nonexistent file."
 msgstr "ཡིག་ཆ་གནས་མེད།"
 
 #: errtxt.src
+#, fuzzy
 msgctxt ""
 "errtxt.src\n"
 "RID_ERRHDL\n"
diff --git a/source/bo/svx/source/svdraw.po b/source/bo/svx/source/svdraw.po
index e6fd5edc121..b5a5a92e259 100644
--- a/source/bo/svx/source/svdraw.po
+++ b/source/bo/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: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"
 
 #: svdstr.src
 msgctxt ""
@@ -4928,6 +4928,7 @@ msgid "Tables"
 msgstr "རེའུ་མིག"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNameSingulFONTWORK\n"
@@ -4942,6 +4943,7 @@ msgstr ""
 "སྒྱུ་རྩལ་ཡི་གེ།"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNamePluralFONTWORK\n"
diff --git a/source/bo/svx/source/tbxctrls.po b/source/bo/svx/source/tbxctrls.po
index 20839122b06..9878f566c21 100644
--- a/source/bo/svx/source/tbxctrls.po
+++ b/source/bo/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: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"
 
 #: colrctrl.src
 msgctxt ""
@@ -716,6 +716,7 @@ msgid "More..."
 msgstr "བཟོ་ལྟ་…དེ་བས་མང་བ།"
 
 #: tbcontrl.src
+#, fuzzy
 msgctxt ""
 "tbcontrl.src\n"
 "RID_SVXSTR_TEXTCOLOR\n"
@@ -746,6 +747,7 @@ msgid "Font Name. The current font is not available and will be substituted."
 msgstr ""
 
 #: tbunosearchcontrollers.src
+#, fuzzy
 msgctxt ""
 "tbunosearchcontrollers.src\n"
 "RID_SVXSTR_FINDBAR_FIND\n"