Compendium Conflicts should be fuzzy

Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59

12 files changed, 61 insertions, 36 deletions

diff --git a/source/sw-TZ/basctl/source/dlged.po b/source/sw-TZ/basctl/source/dlged.po
index 3911402c484..fa865ccf102 100644
--- a/source/sw-TZ/basctl/source/dlged.po
+++ b/source/sw-TZ/basctl/source/dlged.po
@@ -1,4 +1,4 @@
-#. extracted from basctl/source/dlged
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 15:03+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sw_TZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sw_TZ\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: dlgresid.src
 msgctxt ""
@@ -66,6 +66,7 @@ msgid "Delete"
 msgstr "Futa"
 
 #: managelang.src
+#, fuzzy
 msgctxt ""
 "managelang.src\n"
 "RID_DLG_MANAGE_LANGUAGE\n"
diff --git a/source/sw-TZ/cui/source/options.po b/source/sw-TZ/cui/source/options.po
index d090becca2f..5ae2ed34b9d 100644
--- a/source/sw-TZ/cui/source/options.po
+++ b/source/sw-TZ/cui/source/options.po
@@ -1,4 +1,4 @@
-#. extracted from cui/source/options
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-02-17 21:27+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sw_TZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sw_TZ\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361136479.0\n"
 
 #: certpath.src
@@ -468,6 +468,7 @@ msgid "~Language"
 msgstr "Lugha"
 
 #: optasian.src
+#, fuzzy
 msgctxt ""
 "optasian.src\n"
 "RID_SVXPAGE_ASIAN_LAYOUT\n"
@@ -556,6 +557,7 @@ msgid "~Remove"
 msgstr "Ondoa"
 
 #: optchart.src
+#, fuzzy
 msgctxt ""
 "optchart.src\n"
 "RID_OPTPAGE_CHART_DEFCOLORS\n"
@@ -2704,6 +2706,7 @@ msgid "General"
 msgstr "Jumla"
 
 #: treeopt.src
+#, fuzzy
 msgctxt ""
 "treeopt.src\n"
 "RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS\n"
diff --git a/source/sw-TZ/cui/source/tabpages.po b/source/sw-TZ/cui/source/tabpages.po
index 20d001f2a17..5b8b511a9a5 100644
--- a/source/sw-TZ/cui/source/tabpages.po
+++ b/source/sw-TZ/cui/source/tabpages.po
@@ -1,4 +1,4 @@
-#. extracted from cui/source/tabpages
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2012-06-13 11:32+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sw_TZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sw_TZ\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: autocdlg.src
 msgctxt ""
@@ -1144,6 +1144,7 @@ msgid "H~eight"
 msgstr "Kimo"
 
 #: grfpage.src
+#, fuzzy
 msgctxt ""
 "grfpage.src\n"
 "RID_SVXPAGE_GRFCROP\n"
@@ -3701,6 +3702,7 @@ msgid "~Modify..."
 msgstr "Rekebisha..."
 
 #: tabarea.src
+#, fuzzy
 msgctxt ""
 "tabarea.src\n"
 "RID_SVXPAGE_BITMAP\n"
diff --git a/source/sw-TZ/dbaccess/source/ui/dlg.po b/source/sw-TZ/dbaccess/source/ui/dlg.po
index ba5603c11e5..641a5fca6d2 100644
--- a/source/sw-TZ/dbaccess/source/ui/dlg.po
+++ b/source/sw-TZ/dbaccess/source/ui/dlg.po
@@ -1,4 +1,4 @@
-#. extracted from dbaccess/source/ui/dlg
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-12-15 16:31+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sw_TZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sw_TZ\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: AutoControls.src
 msgctxt ""
@@ -1070,6 +1070,7 @@ msgid "Respect the result set type from the database driver"
 msgstr ""
 
 #: advancedsettings.src
+#, fuzzy
 msgctxt ""
 "advancedsettings.src\n"
 "WORKAROUND\n"
diff --git a/source/sw-TZ/editeng/source/editeng.po b/source/sw-TZ/editeng/source/editeng.po
index 9b82f4172f0..2968958195b 100644
--- a/source/sw-TZ/editeng/source/editeng.po
+++ b/source/sw-TZ/editeng/source/editeng.po
@@ -1,4 +1,4 @@
-#. extracted from editeng/source/editeng
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-02-17 21:27+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sw_TZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sw_TZ\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361136479.0\n"
 
 #: editeng.src
@@ -24,6 +24,7 @@ msgid "Delete"
 msgstr "Futa"
 
 #: editeng.src
+#, fuzzy
 msgctxt ""
 "editeng.src\n"
 "RID_EDITUNDO_MOVE\n"
diff --git a/source/sw-TZ/editeng/source/items.po b/source/sw-TZ/editeng/source/items.po
index 20f03789baa..40a08e3d2c7 100644
--- a/source/sw-TZ/editeng/source/items.po
+++ b/source/sw-TZ/editeng/source/items.po
@@ -1,4 +1,4 @@
-#. extracted from editeng/source/items
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-02-17 21:27+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sw_TZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sw_TZ\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361136479.0\n"
 
 #: page.src
@@ -896,6 +896,7 @@ msgid "Centered"
 msgstr "Centered"
 
 #: svxitems.src
+#, fuzzy
 msgctxt ""
 "svxitems.src\n"
 "RID_SVXITEMS_TAB_ADJUST_DEFAULT\n"
diff --git a/source/sw-TZ/editeng/source/outliner.po b/source/sw-TZ/editeng/source/outliner.po
index 6b57313f7ce..955598efb8f 100644
--- a/source/sw-TZ/editeng/source/outliner.po
+++ b/source/sw-TZ/editeng/source/outliner.po
@@ -1,4 +1,4 @@
-#. extracted from editeng/source/outliner
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,14 +7,15 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 15:05+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sw_TZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sw_TZ\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: outliner.src
+#, fuzzy
 msgctxt ""
 "outliner.src\n"
 "RID_OUTLUNDO_HEIGHT\n"
diff --git a/source/sw-TZ/officecfg/registry/data/org/openoffice/Office/UI.po b/source/sw-TZ/officecfg/registry/data/org/openoffice/Office/UI.po
index 1f94e138996..c47b3893132 100644
--- a/source/sw-TZ/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/sw-TZ/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -1,4 +1,4 @@
-#. extracted from officecfg/registry/data/org/openoffice/Office/UI
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2013-02-17 21:27+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sw_TZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sw_TZ\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361136479.0\n"
 
 #: BaseWindowState.xcu
@@ -3589,6 +3589,7 @@ msgid "Callouts"
 msgstr "Callouts"
 
 #: CalcWindowState.xcu
+#, fuzzy
 msgctxt ""
 "CalcWindowState.xcu\n"
 "..CalcWindowState.UIElements.States.private:resource/toolbar/fontworkobjectbar\n"
@@ -8239,6 +8240,7 @@ msgid "Circles and Ovals"
 msgstr "Circles and Ovals"
 
 #: DrawWindowState.xcu
+#, fuzzy
 msgctxt ""
 "DrawWindowState.xcu\n"
 "..DrawWindowState.UIElements.States.private:resource/toolbar/fontworkobjectbar\n"
@@ -16770,6 +16772,7 @@ msgid "~Ungroup"
 msgstr "~Ungroup"
 
 #: GenericCommands.xcu
+#, fuzzy
 msgctxt ""
 "GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:SetDefault\n"
@@ -19141,6 +19144,7 @@ msgid "Form Design"
 msgstr "Form Design"
 
 #: ImpressWindowState.xcu
+#, fuzzy
 msgctxt ""
 "ImpressWindowState.xcu\n"
 "..ImpressWindowState.UIElements.States.private:resource/toolbar/fontworkobjectbar\n"
@@ -24727,6 +24731,7 @@ msgid "Callouts"
 msgstr "Callouts"
 
 #: WriterFormWindowState.xcu
+#, fuzzy
 msgctxt ""
 "WriterFormWindowState.xcu\n"
 "..WriterFormWindowState.UIElements.States.private:resource/toolbar/fontworkobjectbar\n"
@@ -25066,6 +25071,7 @@ msgid "Callouts"
 msgstr "Callouts"
 
 #: WriterGlobalWindowState.xcu
+#, fuzzy
 msgctxt ""
 "WriterGlobalWindowState.xcu\n"
 "..WriterGlobalWindowState.UIElements.States.private:resource/toolbar/fontworkobjectbar\n"
@@ -25414,6 +25420,7 @@ msgid "Callouts"
 msgstr "Callouts"
 
 #: WriterReportWindowState.xcu
+#, fuzzy
 msgctxt ""
 "WriterReportWindowState.xcu\n"
 "..WriterReportWindowState.UIElements.States.private:resource/toolbar/fontworkobjectbar\n"
@@ -25537,6 +25544,7 @@ msgid "Edit Points"
 msgstr "Edit Points"
 
 #: WriterWebWindowState.xcu
+#, fuzzy
 msgctxt ""
 "WriterWebWindowState.xcu\n"
 "..WriterWebWindowState.UIElements.States.private:resource/toolbar/fontworkobjectbar\n"
@@ -26056,6 +26064,7 @@ msgid "Callouts"
 msgstr "Callouts"
 
 #: WriterWindowState.xcu
+#, fuzzy
 msgctxt ""
 "WriterWindowState.xcu\n"
 "..WriterWindowState.UIElements.States.private:resource/toolbar/fontworkobjectbar\n"
@@ -26422,6 +26431,7 @@ msgid "Callouts"
 msgstr "Callouts"
 
 #: XFormsWindowState.xcu
+#, fuzzy
 msgctxt ""
 "XFormsWindowState.xcu\n"
 "..XFormsWindowState.UIElements.States.private:resource/toolbar/fontworkobjectbar\n"
diff --git a/source/sw-TZ/reportdesign/source/core/resource.po b/source/sw-TZ/reportdesign/source/core/resource.po
index 02f3b91149f..98e1112fd81 100644
--- a/source/sw-TZ/reportdesign/source/core/resource.po
+++ b/source/sw-TZ/reportdesign/source/core/resource.po
@@ -1,4 +1,4 @@
-#. extracted from reportdesign/source/core/resource
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-06 15:07+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sw_TZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sw_TZ\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: strings.src
 msgctxt ""
@@ -95,6 +95,7 @@ msgid "The element is invalid."
 msgstr ""
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_STR_FIXEDTEXT\n"
diff --git a/source/sw-TZ/sd/source/ui/app.po b/source/sw-TZ/sd/source/ui/app.po
index 76a58c9c322..6b1171cbf03 100644
--- a/source/sw-TZ/sd/source/ui/app.po
+++ b/source/sw-TZ/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-02-17 21:27+0000\n"
 "Last-Translator: Andras <timar74@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sw_TZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sw_TZ\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 "X-POOTLE-MTIME: 1361136479.0\n"
 
 #: menuids3_tmpl.src
@@ -4189,6 +4189,7 @@ msgid "Select a template from which to import page designs."
 msgstr ""
 
 #: strings.src
+#, fuzzy
 msgctxt ""
 "strings.src\n"
 "RID_ANNOTATIONS_START\n"
diff --git a/source/sw-TZ/sd/source/ui/view.po b/source/sw-TZ/sd/source/ui/view.po
index 95f942ee51b..28a88cf7ecc 100644
--- a/source/sw-TZ/sd/source/ui/view.po
+++ b/source/sw-TZ/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: sw_TZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sw_TZ\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: DocumentRenderer.src
 msgctxt ""
@@ -96,6 +96,7 @@ msgid "Slides per page"
 msgstr "Mistari kwa ukurasa"
 
 #: DocumentRenderer.src
+#, fuzzy
 msgctxt ""
 "DocumentRenderer.src\n"
 "_STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES\n"
diff --git a/source/sw-TZ/svx/source/svdraw.po b/source/sw-TZ/svx/source/svdraw.po
index 51dbdacce05..7479147e66f 100644
--- a/source/sw-TZ/svx/source/svdraw.po
+++ b/source/sw-TZ/svx/source/svdraw.po
@@ -1,4 +1,4 @@
-#. extracted from svx/source/svdraw
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -7,12 +7,12 @@ msgstr ""
 "PO-Revision-Date: 2011-04-12 01:14+0200\n"
 "Last-Translator: Anonymous Pootle User\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sw_TZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: LibreOffice\n"
+"Language: sw_TZ\n"
 "X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
 
 #: svdstr.src
 msgctxt ""
@@ -4927,6 +4927,7 @@ msgid "Tables"
 msgstr "Majedwali"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNameSingulFONTWORK\n"
@@ -4941,6 +4942,7 @@ msgstr ""
 "Fontwork"
 
 #: svdstr.src
+#, fuzzy
 msgctxt ""
 "svdstr.src\n"
 "STR_ObjNamePluralFONTWORK\n"