Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

6 files changed, 33 insertions, 18 deletions

diff --git a/source/dz/sd/source/core.po b/source/dz/sd/source/core.po
index 9ecaa677251..640a409a38e 100644
--- a/source/dz/sd/source/core.po
+++ b/source/dz/sd/source/core.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/core
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-12-15 12:55+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"
 
 #: glob.src
 msgctxt ""
@@ -588,6 +588,7 @@ msgid "Media Playback"
 msgstr "གླུ་གཞས་གཏང་ནིའི་བརྡ་ལམ།"
 
 #: glob.src
+#, fuzzy
 msgctxt ""
 "glob.src\n"
 "STR_TABLEOBJECTBARSHELL\n"
diff --git a/source/dz/sd/source/ui/annotations.po b/source/dz/sd/source/ui/annotations.po
index 6026c90144c..4e571f4e726 100644
--- a/source/dz/sd/source/ui/annotations.po
+++ b/source/dz/sd/source/ui/annotations.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/annotations
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-05 19:34+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"
 
 #: annotations.src
 msgctxt ""
@@ -61,6 +61,7 @@ msgid "~Strikethrough"
 msgstr ""
 
 #: annotations.src
+#, fuzzy
 msgctxt ""
 "annotations.src\n"
 "RID_ANNOTATION_CONTEXTMENU\n"
diff --git a/source/dz/sd/source/ui/app.po b/source/dz/sd/source/ui/app.po
index b37bade74ad..18c8f3a75f6 100644
--- a/source/dz/sd/source/ui/app.po
+++ b/source/dz/sd/source/ui/app.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/app
+# 
 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: 1366023947.0\n"
 
 #: menuids3_tmpl.src
@@ -1822,6 +1822,7 @@ msgid "Custom Styles"
 msgstr "སྲོལ་སྒྲིག་བཟོ་རྣམ།"
 
 #: res_bmp.src
+#, fuzzy
 msgctxt ""
 "res_bmp.src\n"
 "STR_STYLE_FILTER_ALL\n"
@@ -1834,6 +1835,7 @@ msgstr ""
 "ནང་ཐིག་གི་བཟོ་རྣམ།(~C)"
 
 #: res_bmp.src
+#, fuzzy
 msgctxt ""
 "res_bmp.src\n"
 "DLG_STYLE_DESIGNER.RID_GRAPHICSTYLEFAMILY\n"
@@ -1874,6 +1876,7 @@ msgid "Custom Styles"
 msgstr "སྲོལ་སྒྲིག་བཟོ་རྣམ།"
 
 #: res_bmp.src
+#, fuzzy
 msgctxt ""
 "res_bmp.src\n"
 "DLG_STYLE_DESIGNER.RID_PRESENTATIONSTYLEFAMILY\n"
@@ -4128,6 +4131,7 @@ msgid "Graphics Styles"
 msgstr "ཚད་རིས་ཚུའི་བཟོ་རྣམ་ཚུ།"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "STR_CELL_STYLE_FAMILY\n"
@@ -4204,6 +4208,7 @@ msgid "Select a template from which to import page designs."
 msgstr ""
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_ANNOTATIONS_START\n"
@@ -4318,6 +4323,7 @@ msgid "Media Playback"
 msgstr "བརྡ་བརྒྱུད་གླུ་གཞས་གཏང་ནི།"
 
 #: toolbox.src
+#, fuzzy
 msgctxt ""
 "toolbox.src\n"
 "RID_DRAW_TABLE_TOOLBOX\n"
diff --git a/source/dz/sd/source/ui/dlg.po b/source/dz/sd/source/ui/dlg.po
index abe498aae4f..ba589e18a7f 100644
--- a/source/dz/sd/source/ui/dlg.po
+++ b/source/dz/sd/source/ui/dlg.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/dlg
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2012-12-26 11:07+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: 1356520050.0\n"
 
 #: PaneDockingWindow.src
@@ -883,6 +883,7 @@ msgid "~Create"
 msgstr "གསར་བསྐྲུན།(~C)"
 
 #: dlgass.src
+#, fuzzy
 msgctxt ""
 "dlgass.src\n"
 "DLG_ASS\n"
diff --git a/source/dz/sd/source/ui/table.po b/source/dz/sd/source/ui/table.po
index 472cd6b493e..439da7f6465 100644
--- a/source/dz/sd/source/ui/table.po
+++ b/source/dz/sd/source/ui/table.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/table
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,15 +7,16 @@ 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"
 
 #: TableDesignPane.src
+#, fuzzy
 msgctxt ""
 "TableDesignPane.src\n"
 "DLG_TABLEDESIGNPANE\n"
diff --git a/source/dz/sd/source/ui/view.po b/source/dz/sd/source/ui/view.po
index e3b45c6e96c..f8ab2aab2a3 100644
--- a/source/dz/sd/source/ui/view.po
+++ b/source/dz/sd/source/ui/view.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/view
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 00:12+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"
 
 #: DocumentRenderer.src
 msgctxt ""
@@ -34,6 +34,7 @@ msgid "Print content"
 msgstr "ཐོ་ཡིག་ནང་དོན།"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -53,6 +54,7 @@ msgstr ""
 "དཔར་བསྐུན་འབད།"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -123,6 +125,7 @@ msgid "Slides per page"
 msgstr "ཤོག་ལེབ་རེ་ལུ་ གྲལ་ཐིག་ཚུ།"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES\n"
@@ -225,6 +228,7 @@ msgid "Top to bottom, then right"
 msgstr "སྤྱི་ཏོག་ལས་གཤམ་ལུ་དང་དེ་ལས་ གཡས་ལུ།(~T)"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -303,6 +307,7 @@ msgid "Original colors"
 msgstr ""
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_QUALITY_CHOICES\n"