Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

5 files changed, 28 insertions, 15 deletions

diff --git a/source/st/sd/source/core.po b/source/st/sd/source/core.po
index f5993c7d75d..d363b634153 100644
--- a/source/st/sd/source/core.po
+++ b/source/st/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: 2012-06-13 11:30+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: st\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: st\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: glob.src
 msgctxt ""
@@ -586,6 +586,7 @@ msgid "Media Playback"
 msgstr "Ho Bapala ha Mediya"
 
 #: glob.src
+#, fuzzy
 msgctxt ""
 "glob.src\n"
 "STR_TABLEOBJECTBARSHELL\n"
@@ -755,6 +756,7 @@ msgid "Banding cell"
 msgstr ""
 
 #: glob.src
+#, fuzzy
 msgctxt ""
 "glob.src\n"
 "STR_POOLSHEET_HEADER\n"
diff --git a/source/st/sd/source/ui/annotations.po b/source/st/sd/source/ui/annotations.po
index 5270d14d78f..39af6fcb0b0 100644
--- a/source/st/sd/source/ui/annotations.po
+++ b/source/st/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: 2013-04-15 12:25+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: st\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: st\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366028725.0\n"
 
 #: annotations.src
@@ -62,6 +62,7 @@ msgid "~Strikethrough"
 msgstr "Seke wa shapa le ho paroletsa"
 
 #: annotations.src
+#, fuzzy
 msgctxt ""
 "annotations.src\n"
 "RID_ANNOTATION_CONTEXTMENU\n"
diff --git a/source/st/sd/source/ui/app.po b/source/st/sd/source/ui/app.po
index 398cf6b84d5..5e227ca950b 100644
--- a/source/st/sd/source/ui/app.po
+++ b/source/st/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 12:25+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: st\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: st\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366028726.0\n"
 
 #: menuids3_tmpl.src
@@ -1025,6 +1025,7 @@ msgid "F~ontwork"
 msgstr "M~osebetsi wa fonto"
 
 #: menuids_tmpl.src
+#, fuzzy
 msgctxt ""
 "menuids_tmpl.src\n"
 "MN_ORIGINAL_SIZE\n"
@@ -4174,6 +4175,7 @@ msgid "Select a template from which to import page designs."
 msgstr ""
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_ANNOTATIONS_START\n"
@@ -4276,6 +4278,7 @@ msgid "Function Bar (viewing mode)"
 msgstr "Bara ya ho Sebetsa (moutu wa ho sheba)"
 
 #: toolbox.src
+#, fuzzy
 msgctxt ""
 "toolbox.src\n"
 "RID_DRAW_MEDIA_TOOLBOX\n"
diff --git a/source/st/sd/source/ui/slideshow.po b/source/st/sd/source/ui/slideshow.po
index afc75378656..a58ee885b01 100644
--- a/source/st/sd/source/ui/slideshow.po
+++ b/source/st/sd/source/ui/slideshow.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/slideshow
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,13 +7,13 @@ msgstr ""
 "PO-Revision-Date: 2011-12-15 16:26+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: st\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: st\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: slideshow.src
 msgctxt ""
@@ -88,6 +88,7 @@ msgid "~Thin"
 msgstr "Tshesane"
 
 #: slideshow.src
+#, fuzzy
 msgctxt ""
 "slideshow.src\n"
 "RID_SLIDESHOW_CONTEXTMENU.CM_WIDTH_PEN\n"
diff --git a/source/st/sd/source/ui/view.po b/source/st/sd/source/ui/view.po
index 82916391ac5..41b18d88729 100644
--- a/source/st/sd/source/ui/view.po
+++ b/source/st/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 01:19+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: st\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: st\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: DocumentRenderer.src
 msgctxt ""
@@ -34,6 +34,7 @@ msgid "Print content"
 msgstr "Dikahare tsa lethathamo"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -82,6 +83,7 @@ msgid "Handouts"
 msgstr "Tse fanwang"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_CONTENT_CHOICES\n"
@@ -97,6 +99,7 @@ msgstr ""
 "Dintlha"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_CONTENT_CHOICES\n"
@@ -295,6 +298,7 @@ msgid "Original colors"
 msgstr ""
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_QUALITY_CHOICES\n"
@@ -319,6 +323,7 @@ msgid "Black & white"
 msgstr "Botsho & ~bosweu"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -480,6 +485,7 @@ msgid "~Use only paper tray from printer preferences"
 msgstr ""
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"