Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

7 files changed, 50 insertions, 21 deletions

diff --git a/source/tn/sd/source/core.po b/source/tn/sd/source/core.po
index ef6ab07a65a..bcca002e3bb 100644
--- a/source/tn/sd/source/core.po
+++ b/source/tn/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: 2013-04-15 12:32+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029168.0\n"
 
 #: glob.src
@@ -64,6 +64,7 @@ msgid "Slide"
 msgstr " Dikgogelothoko"
 
 #: glob.src
+#, fuzzy
 msgctxt ""
 "glob.src\n"
 "STR_PAGE_NAME\n"
@@ -608,6 +609,7 @@ msgid "Media Playback"
 msgstr ""
 
 #: glob.src
+#, fuzzy
 msgctxt ""
 "glob.src\n"
 "STR_TABLEOBJECTBARSHELL\n"
@@ -683,6 +685,7 @@ msgid "Slides"
 msgstr " Dikgogelothoko"
 
 #: glob.src
+#, fuzzy
 msgctxt ""
 "glob.src\n"
 "STR_LEFT_DRAW_PANE_SHELL\n"
@@ -711,6 +714,7 @@ msgstr ""
 "ebe"
 
 #: glob.src
+#, fuzzy
 msgctxt ""
 "glob.src\n"
 "STR_TASKPANEVIEWSHELL\n"
diff --git a/source/tn/sd/source/ui/animations.po b/source/tn/sd/source/ui/animations.po
index 8f2cacf7669..cf65718c27f 100644
--- a/source/tn/sd/source/ui/animations.po
+++ b/source/tn/sd/source/ui/animations.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/animations
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-04-15 12:32+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029169.0\n"
 
 #: CustomAnimation.src
@@ -142,6 +142,7 @@ msgid "Extra large"
 msgstr ""
 
 #: CustomAnimation.src
+#, fuzzy
 msgctxt ""
 "CustomAnimation.src\n"
 "RID_CUSTOMANIMATION_SCALE_POPUP\n"
@@ -229,6 +230,7 @@ msgid "Counter-clockwise"
 msgstr ""
 
 #: CustomAnimation.src
+#, fuzzy
 msgctxt ""
 "CustomAnimation.src\n"
 "RID_CUSTOMANIMATION_FONTSTYLE_POPUP\n"
@@ -250,6 +252,7 @@ msgstr ""
 "Tiisa"
 
 #: CustomAnimation.src
+#, fuzzy
 msgctxt ""
 "CustomAnimation.src\n"
 "RID_CUSTOMANIMATION_FONTSTYLE_POPUP\n"
@@ -448,6 +451,7 @@ msgid "Font size"
 msgstr "Mokwalo bogolo"
 
 #: CustomAnimation.src
+#, fuzzy
 msgctxt ""
 "CustomAnimation.src\n"
 "STR_CUSTOMANIMATION_SCALE_PROPERTY\n"
@@ -705,6 +709,7 @@ msgid "Effect Options"
 msgstr "Effect Options"
 
 #: CustomAnimationDialog.src
+#, fuzzy
 msgctxt ""
 "CustomAnimationDialog.src\n"
 "RID_TP_CUSTOMANIMATION_EFFECT\n"
diff --git a/source/tn/sd/source/ui/annotations.po b/source/tn/sd/source/ui/annotations.po
index 3655be155d3..5855a1e76dc 100644
--- a/source/tn/sd/source/ui/annotations.po
+++ b/source/tn/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:32+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029169.0\n"
 
 #: annotations.src
@@ -61,6 +61,7 @@ msgid "~Strikethrough"
 msgstr "Ga go tswelopele"
 
 #: annotations.src
+#, fuzzy
 msgctxt ""
 "annotations.src\n"
 "RID_ANNOTATION_CONTEXTMENU\n"
@@ -78,6 +79,7 @@ msgstr ""
 "~Kopisa"
 
 #: annotations.src
+#, fuzzy
 msgctxt ""
 "annotations.src\n"
 "RID_ANNOTATION_CONTEXTMENU\n"
diff --git a/source/tn/sd/source/ui/app.po b/source/tn/sd/source/ui/app.po
index 5916228f4e5..309efe706fa 100644
--- a/source/tn/sd/source/ui/app.po
+++ b/source/tn/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:32+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1366029170.0\n"
 
 #: menuids3_tmpl.src
@@ -1024,6 +1024,7 @@ msgid "F~ontwork"
 msgstr "Tiro ya mkwalo"
 
 #: menuids_tmpl.src
+#, fuzzy
 msgctxt ""
 "menuids_tmpl.src\n"
 "MN_ORIGINAL_SIZE\n"
@@ -2821,6 +2822,7 @@ msgid "This graphics file version is not supported"
 msgstr "Tse dikwalo tsa modiro wfaele ga di atshegetswa"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "STR_IMPORT_GRFILTER_FILTERERROR\n"
@@ -3325,6 +3327,7 @@ msgid "Bottom Right?"
 msgstr "Tlase Moja?"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "STR_GLUE_ESCDIR_HORZ\n"
@@ -4027,6 +4030,7 @@ msgid "Slides"
 msgstr " Dikgogelothoko"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "STR_LEFT_PANE_DRAW_TITLE\n"
@@ -4043,6 +4047,7 @@ msgstr ""
 "Dutsebe"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "STR_RIGHT_PANE_TITLE\n"
@@ -4063,6 +4068,7 @@ msgid "Master Pages"
 msgstr "Bofelo Tsebe"
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "STR_TASKPANEL_MASTER_PAGE_MENU_TITLE\n"
@@ -4228,6 +4234,7 @@ msgid "Select a template from which to import page designs."
 msgstr ""
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_ANNOTATIONS_START\n"
@@ -4336,6 +4343,7 @@ msgid "Media Playback"
 msgstr ""
 
 #: toolbox.src
+#, fuzzy
 msgctxt ""
 "toolbox.src\n"
 "RID_DRAW_TABLE_TOOLBOX\n"
diff --git a/source/tn/sd/source/ui/dlg.po b/source/tn/sd/source/ui/dlg.po
index 9f0e7cf5f48..5983580a695 100644
--- a/source/tn/sd/source/ui/dlg.po
+++ b/source/tn/sd/source/ui/dlg.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/dlg
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-12-26 11:21+0000\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1356520866.0\n"
 
 #: PaneDockingWindow.src
@@ -480,6 +480,7 @@ msgid "Bottom Right"
 msgstr "Moja o o kw atlase"
 
 #: animobjs.src
+#, fuzzy
 msgctxt ""
 "animobjs.src\n"
 "FLT_WIN_ANIMATION\n"
@@ -502,6 +503,7 @@ msgid "Animation group"
 msgstr "Tlhamo setlhopha"
 
 #: animobjs.src
+#, fuzzy
 msgctxt ""
 "animobjs.src\n"
 "FLT_WIN_ANIMATION\n"
@@ -604,6 +606,7 @@ msgid "Return"
 msgstr "Boela thaepa"
 
 #: dlg_char.src
+#, fuzzy
 msgctxt ""
 "dlg_char.src\n"
 "TAB_CHAR\n"
@@ -620,6 +623,7 @@ msgstr ""
 "Sediragatsi"
 
 #: dlgass.src
+#, fuzzy
 msgctxt ""
 "dlgass.src\n"
 "DLG_ASS\n"
@@ -913,6 +917,7 @@ msgid "~Next >>"
 msgstr "~Latelang >>"
 
 #: dlgass.src
+#, fuzzy
 msgctxt ""
 "dlgass.src\n"
 "DLG_ASS\n"
@@ -935,6 +940,7 @@ msgid "~Open"
 msgstr "~Bula"
 
 #: dlgass.src
+#, fuzzy
 msgctxt ""
 "dlgass.src\n"
 "DLG_ASS\n"
@@ -2433,6 +2439,7 @@ msgid "Other"
 msgstr "Tse dingwe"
 
 #: vectdlg.src
+#, fuzzy
 msgctxt ""
 "vectdlg.src\n"
 "DLG_VECTORIZE\n"
diff --git a/source/tn/sd/source/ui/table.po b/source/tn/sd/source/ui/table.po
index 84a6d07efb3..ff0cb3f117d 100644
--- a/source/tn/sd/source/ui/table.po
+++ b/source/tn/sd/source/ui/table.po
@@ -1,4 +1,4 @@
-#. extracted from sd/source/ui/table
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,14 +7,15 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 04:01+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: TableDesignPane.src
+#, fuzzy
 msgctxt ""
 "TableDesignPane.src\n"
 "DLG_TABLEDESIGNPANE\n"
@@ -84,6 +85,7 @@ msgid "Ba~nded Columns"
 msgstr ""
 
 #: TableDesignPane.src
+#, fuzzy
 msgctxt ""
 "TableDesignPane.src\n"
 "DLG_TABLEDESIGNPANE\n"
diff --git a/source/tn/sd/source/ui/view.po b/source/tn/sd/source/ui/view.po
index 4a0944118b4..a8c4f8501fe 100644
--- a/source/tn/sd/source/ui/view.po
+++ b/source/tn/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 01:13+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: tn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: tn\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: DocumentRenderer.src
 msgctxt ""
@@ -258,6 +258,7 @@ msgid "Original colors"
 msgstr ""
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_QUALITY_CHOICES\n"