Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

6 files changed, 34 insertions, 18 deletions

diff --git a/source/nr/sd/source/core.po b/source/nr/sd/source/core.po
index 8233f9656aa..d043b72091d 100644
--- a/source/nr/sd/source/core.po
+++ b/source/nr/sd/source/core.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/core
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-06-16 15:13+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: glob.src
 msgctxt ""
@@ -585,6 +585,7 @@ msgid "Media Playback"
 msgstr "Buyelela Zezeendaba"
 
 #: glob.src
+#, fuzzy
 msgctxt ""
 "glob.src\n"
 "STR_TABLEOBJECTBARSHELL\n"
@@ -752,6 +753,7 @@ msgid "Banding cell"
 msgstr ""
 
 #: glob.src
+#, fuzzy
 msgctxt ""
 "glob.src\n"
 "STR_POOLSHEET_HEADER\n"
diff --git a/source/nr/sd/source/ui/annotations.po b/source/nr/sd/source/ui/annotations.po
index 0fba9ec1479..894738fd20a 100644
--- a/source/nr/sd/source/ui/annotations.po
+++ b/source/nr/sd/source/ui/annotations.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/annotations
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:00+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366027253.0\n"
 
 #: annotations.src
@@ -70,6 +70,7 @@ msgid "~Copy"
 msgstr "~Kopa"
 
 #: annotations.src
+#, fuzzy
 msgctxt ""
 "annotations.src\n"
 "RID_ANNOTATION_CONTEXTMENU\n"
diff --git a/source/nr/sd/source/ui/app.po b/source/nr/sd/source/ui/app.po
index 76cbe2e009b..73ff298d82e 100644
--- a/source/nr/sd/source/ui/app.po
+++ b/source/nr/sd/source/ui/app.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/app
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:00+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366027254.0\n"
 
 #: menuids3_tmpl.src
@@ -1024,6 +1024,7 @@ msgid "F~ontwork"
 msgstr "Um~sebenzi wefonti"
 
 #: menuids_tmpl.src
+#, fuzzy
 msgctxt ""
 "menuids_tmpl.src\n"
 "MN_ORIGINAL_SIZE\n"
@@ -4269,6 +4270,7 @@ msgid "Function Bar (viewing mode)"
 msgstr "IBha yomSebenzi (indlea yokubona)"
 
 #: toolbox.src
+#, fuzzy
 msgctxt ""
 "toolbox.src\n"
 "RID_DRAW_MEDIA_TOOLBOX\n"
@@ -4281,6 +4283,7 @@ msgstr ""
 "Buyelela Zezeendaba"
 
 #: toolbox.src
+#, fuzzy
 msgctxt ""
 "toolbox.src\n"
 "RID_DRAW_TABLE_TOOLBOX\n"
diff --git a/source/nr/sd/source/ui/slideshow.po b/source/nr/sd/source/ui/slideshow.po
index 33c64da9a99..39a17813c1a 100644
--- a/source/nr/sd/source/ui/slideshow.po
+++ b/source/nr/sd/source/ui/slideshow.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/slideshow
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-12-15 15:33+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: slideshow.src
 msgctxt ""
@@ -87,6 +87,7 @@ msgid "~Thin"
 msgstr "Dweni"
 
 #: slideshow.src
+#, fuzzy
 msgctxt ""
 "slideshow.src\n"
 "RID_SLIDESHOW_CONTEXTMENU.CM_WIDTH_PEN\n"
diff --git a/source/nr/sd/source/ui/table.po b/source/nr/sd/source/ui/table.po
index efeba9a0d36..a900fbe861a 100644
--- a/source/nr/sd/source/ui/table.po
+++ b/source/nr/sd/source/ui/table.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/table
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 01:08+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: TableDesignPane.src
 msgctxt ""
@@ -78,6 +78,7 @@ msgid "Ba~nded Columns"
 msgstr ""
 
 #: TableDesignPane.src
+#, fuzzy
 msgctxt ""
 "TableDesignPane.src\n"
 "DLG_TABLEDESIGNPANE\n"
diff --git a/source/nr/sd/source/ui/view.po b/source/nr/sd/source/ui/view.po
index 616b79c381c..8176e7fdcb1 100644
--- a/source/nr/sd/source/ui/view.po
+++ b/source/nr/sd/source/ui/view.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/view
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 00:55+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: nr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: nr\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: DocumentRenderer.src
 msgctxt ""
@@ -33,6 +33,7 @@ msgid "Print content"
 msgstr "Irhemo okungaphakathi"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -52,6 +53,7 @@ msgstr ""
 "Gadangisa"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -95,6 +97,7 @@ msgid "Handouts"
 msgstr "Okunikelwako"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_CONTENT_CHOICES\n"
@@ -110,6 +113,7 @@ msgstr ""
 "Amanothi"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_CONTENT_CHOICES\n"
@@ -209,6 +213,7 @@ msgid "9"
 msgstr ""
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -314,6 +319,7 @@ msgid "Original colors"
 msgstr ""
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_QUALITY_CHOICES\n"
@@ -338,6 +344,7 @@ msgid "Black & white"
 msgstr "Ubunzima & ~ubumhlophe"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"
@@ -499,6 +506,7 @@ msgid "~Use only paper tray from printer preferences"
 msgstr ""
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS\n"