Automated l10n update (.po files)

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2014-09-29 03:08:03 -0500
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2014-09-29 03:08:03 -0500
commit: 242434109c14a494dee7738b9c343f5947d20506 (patch)
tree: ea25930767128361a7669f1a25a479a66ccdfbeb /tde-i18n-en_GB/messages/tdesdk
parent: 8819501c6a160b7ae106b1a968bc953b0f0bc465 (diff)
download: tde-i18n-242434109c14a494dee7738b9c343f5947d20506.tar.gz
tde-i18n-242434109c14a494dee7738b9c343f5947d20506.zip
16 files changed, 7092 insertions, 7037 deletions
diff --git a/tde-i18n-en_GB/messages/tdesdk/cervisia.po b/tde-i18n-en_GB/messages/tdesdk/cervisia.po
index f446cdccb5e..44e8e95102f 100644
--- a/tde-i18n-en_GB/messages/tdesdk/cervisia.po
+++ b/tde-i18n-en_GB/messages/tdesdk/cervisia.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cervisia\n"
-"POT-Creation-Date: 2007-09-24 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2006-01-18 19:48+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -564,9 +565,10 @@ msgid "Edit With"
 msgstr "Edit With"
 
 #: cervisiapart.cpp:713
+#, fuzzy
 msgid ""
 "Cervisia %1\n"
-"(Using TDE %2)\n"
+"(Using KDE %2)\n"
 "\n"
 "Copyright (c) 1999-2002\n"
 "Bernd Gehrmann <bernd@mail.berlios.de>\n"
diff --git a/tde-i18n-en_GB/messages/tdesdk/cvsservice.po b/tde-i18n-en_GB/messages/tdesdk/cvsservice.po
index 0639f579e63..40c49d95af9 100644
--- a/tde-i18n-en_GB/messages/tdesdk/cvsservice.po
+++ b/tde-i18n-en_GB/messages/tdesdk/cvsservice.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cvsservice\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2003-10-30 20:15+0000\n"
 "Last-Translator: Jonathan Riddell <kde-en-gb@jriddell.org>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,7 +52,7 @@ msgstr "Please type in your password below."
 msgid "Repository:"
 msgstr "Repository:"
 
-#: cvsloginjob.cpp:116
+#: cvsloginjob.cpp:117
 msgid "Please type in your password for the repository below."
 msgstr "Please type in your password for the repository below."
 
diff --git a/tde-i18n-en_GB/messages/tdesdk/kbabel.po b/tde-i18n-en_GB/messages/tdesdk/kbabel.po
index 8faf2103403..ab1712e35bd 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kbabel.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kbabel.po
@@ -7,1611 +7,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbabel\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2006-03-12 17:43+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: catalogmanager/catalogmanagerview.cpp:89
-msgid "Name"
-msgstr "Name"
-
-#: catalogmanager/catalogmanagerview.cpp:90
-msgid "M"
-msgstr "M"
-
-#: catalogmanager/catalogmanagerview.cpp:91
-msgid "Fuzzy"
-msgstr "Fuzzy"
-
-#: catalogmanager/catalogmanagerview.cpp:92
-msgid "Untranslated"
-msgstr "Untranslated"
-
-#: catalogmanager/catalogmanagerview.cpp:93
-msgid "Total"
-msgstr "Total"
-
-#: catalogmanager/catalogmanagerview.cpp:94 catalogmanager/future.cpp:5
-msgid "CVS/SVN Status"
-msgstr "CVS/SVN Status"
-
-#: catalogmanager/catalogmanagerview.cpp:95
-msgid "Last Revision"
-msgstr "Last Revision"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:56
-#: catalogmanager/catalogmanagerview.cpp:96
-msgid "Last Translator"
-msgstr "Last Translator"
-
-#: catalogmanager/catalogmanagerview.cpp:178
-#: catalogmanager/catalogmanagerview.cpp:2447
-#: catalogmanager/catalogmanagerview.cpp:2458
-msgid "Log Window"
-msgstr "Log Window"
-
-#: catalogmanager/catalogmanagerview.cpp:180
-msgid "C&lear"
-msgstr "C&lear"
-
-#: catalogmanager/catalogmanagerview.cpp:183
-msgid ""
-"<qt>"
-"<p><b>Log window</b></p>\n"
-"<p>In this window the output of the executed commands are shown.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Log window</b></p>\n"
-"<p>In this window the output of the executed commands are shown.</p></qt>"
-
-#: catalogmanager/catalogmanagerview.cpp:194
-msgid ""
-"<qt>"
-"<p><b>Catalog Manager</b></p>\n"
-"<p>The Catalog Manager merges two folders into one tree and displays all\n"
-"PO and POT files in these folders. This way you can easily see if a\n"
-"template has been added or removed. Also some information about the files\n"
-"is displayed.</p>"
-"<p>For more information see section <b>The Catalog Manager</b> "
-"in the online help.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Catalogue Manager</b></p>\n"
-"<p>The Catalogue Manager merges two folders into one tree and displays all\n"
-"PO and POT files in these folders. This way you can easily see if a\n"
-"new template has been added or removed. Also some information about the files\n"
-"is displayed.</p>"
-"<p>For more information see section <b>The Catalogue Manager</b> "
-"in the online help.</p></qt>"
-
-#: catalogmanager/catalogmanagerview.cpp:448
-#: catalogmanager/catalogmanagerview.cpp:483 kbabel/kbabelview.cpp:1233
-#: kbabel/kbabelview.cpp:1349 kbabel/kbabelview2.cpp:757
-#, c-format
-msgid ""
-"Error while trying to open file:\n"
-" %1"
-msgstr ""
-"Error while trying to open file:\n"
-" %1"
-
-#: catalogmanager/catalogmanagerview.cpp:473
-msgid ""
-"Error while trying to read file:\n"
-" %1\n"
-"Maybe it is not a valid file with list of markings."
-msgstr ""
-"Error while trying to read file:\n"
-" %1\n"
-"Maybe it is not a valid file with list of markings."
-
-#: catalogmanager/catalogmanagerview.cpp:519 kbabel/kbabelview.cpp:1451
-msgid "The file %1 already exists. Do you want to overwrite it?"
-msgstr "The file %1 already exists. Do you want to overwrite it?"
-
-#: catalogmanager/catalogmanagerview.cpp:520 kbabel/kbabelview.cpp:1452
-#: kbabel/kbabelview.cpp:1521
-msgid "&Overwrite"
-msgstr "&Overwrite"
-
-#: catalogmanager/catalogmanagerview.cpp:571
-msgid ""
-"An error occurred while trying to write to file:\n"
-"%1\n"
-msgstr ""
-"An error occurred while trying to write to file:\n"
-"%1\n"
-
-#: catalogmanager/catalogmanagerview.cpp:580
-msgid ""
-"An error occurred while trying to upload the file:\n"
-"%1\n"
-msgstr ""
-"An error occurred while trying to upload the file:\n"
-"%1\n"
-
-#: catalogmanager/catalogmanagerview.cpp:664
-#: catalogmanager/catalogmanagerview.cpp:691
-msgid ""
-"The Catalog Manager is still updating information about the files.\n"
-"If you continue, it will try to update all necessary files, however this can "
-"take a long time and may lead to wrong results. Please wait until all files are "
-"updated."
-msgstr ""
-"The Catalogue Manager is still updating information about the files.\n"
-"If you continue, it will try to update all necessary files, however this can "
-"take a long time and may lead to wrong results. Please wait until all files are "
-"updated."
-
-#: catalogmanager/catalogmanagerview.cpp:769
-msgid ""
-"Statistics for all:\n"
-msgstr ""
-"Statistics for all:\n"
-
-#: catalogmanager/catalogmanagerview.cpp:771
-msgid ""
-"Statistics for %1:\n"
-msgstr ""
-"Statistics for %1:\n"
-
-#: catalogmanager/catalogmanagerview.cpp:773
-msgid ""
-"Number of packages: %1\n"
-msgstr ""
-"Number of packages: %1\n"
-
-#: catalogmanager/catalogmanagerview.cpp:776
-msgid ""
-"Complete translated: %1 % (%2)\n"
-msgstr ""
-"Complete translated: %1 % (%2)\n"
-
-#: catalogmanager/catalogmanagerview.cpp:779
-msgid ""
-"Only template available: %1 % (%2)\n"
-msgstr ""
-"Only template available: %1 % (%2)\n"
-
-#: catalogmanager/catalogmanagerview.cpp:781
-msgid ""
-"Only PO file available: %1 % (%2)\n"
-msgstr ""
-"Only PO file available: %1 % (%2)\n"
-
-#: catalogmanager/catalogmanagerview.cpp:783
-msgid ""
-"Number of messages: %1\n"
-msgstr ""
-"Number of messages: %1\n"
-
-#: catalogmanager/catalogmanagerview.cpp:787
-msgid ""
-"Translated: %1 % (%2)\n"
-msgstr ""
-"Translated: %1 % (%2)\n"
-
-#: catalogmanager/catalogmanagerview.cpp:790
-msgid ""
-"Fuzzy: %1 % (%2)\n"
-msgstr ""
-"Fuzzy: %1 % (%2)\n"
-
-#: catalogmanager/catalogmanagerview.cpp:793
-msgid ""
-"Untranslated: %1 % (%2)\n"
-msgstr ""
-"Untranslated: %1 % (%2)\n"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 790
-#: catalogmanager/catalogmanagerview.cpp:795 rc.cpp:1001 rc.cpp:1206
-#, no-c-format
-msgid "Statistics"
-msgstr "Statistics"
-
-#: catalogmanager/catalogmanagerview.cpp:820
-msgid ""
-"The file is syntactically correct.\n"
-"Output of \"msgfmt --statistics\":"
-msgstr ""
-"The file is syntactically correct.\n"
-"Output of \"msgfmt --statistics\":"
-
-#: catalogmanager/catalogmanagerview.cpp:825
-msgid ""
-"The file has syntax errors.\n"
-"Output of \"msgfmt --statistics\":"
-msgstr ""
-"The file has syntax errors.\n"
-"Output of \"msgfmt --statistics\":"
-
-#: catalogmanager/catalogmanagerview.cpp:830
-msgid ""
-"The file has header syntax error.\n"
-"Output of \"msgfmt --statistics\":"
-msgstr ""
-"The file has header syntax error.\n"
-"Output of \"msgfmt --statistics\":"
-
-#: catalogmanager/catalogmanagerview.cpp:835
-msgid "An error occurred while processing \"msgfmt --statistics\""
-msgstr "An error occurred while processing \"msgfmt --statistics\""
-
-#: catalogmanager/catalogmanagerview.cpp:840
-#: catalogmanager/catalogmanagerview.cpp:929
-msgid ""
-"Cannot execute msgfmt. Please make sure that you have msgfmt in your PATH."
-msgstr ""
-"Cannot execute msgfmt. Please make sure that you have msgfmt in your PATH."
-
-#: catalogmanager/catalogmanagerview.cpp:845
-#: catalogmanager/catalogmanagerview.cpp:934 kbabel/kbabelview.cpp:1649
-msgid "You can use gettext tools only for checking PO files."
-msgstr "You can use gettext tools only for checking PO files."
-
-#: catalogmanager/catalogmanagerview.cpp:868
-msgid ""
-"All files in folder %1 are syntactically correct.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-"All files in folder %1 are syntactically correct.\n"
-"Output of \"msgfmt --statistics\":\n"
-
-#: catalogmanager/catalogmanagerview.cpp:873
-msgid ""
-"All files in the base folder are syntactically correct.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-"All files in the base folder are syntactically correct.\n"
-"Output of \"msgfmt --statistics\":\n"
-
-#: catalogmanager/catalogmanagerview.cpp:884
-msgid ""
-"At least one file in folder %1 has syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-"At least one file in folder %1 has syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-
-#: catalogmanager/catalogmanagerview.cpp:889
-msgid ""
-"At least one file in the base folder has syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-"At least one file in the base folder has syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-
-#: catalogmanager/catalogmanagerview.cpp:900
-msgid ""
-"At least one file in folder %1 has header syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-"At least one file in folder %1 has header syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-
-#: catalogmanager/catalogmanagerview.cpp:905
-msgid ""
-"At least one file in the base folder has header syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-"At least one file in the base folder has header syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-
-#: catalogmanager/catalogmanagerview.cpp:916
-#, c-format
-msgid ""
-"An error occurred while processing \"msgfmt --statistics *.po\" in folder %1"
-msgstr ""
-"An error occurred while processing \"msgfmt --statistics *.po\" in folder %1"
-
-#: catalogmanager/catalogmanagerview.cpp:921
-msgid ""
-"An error occurred while processing \"msgfmt --statistics *.po\" in the base "
-"folder"
-msgstr ""
-"An error occurred while processing \"msgfmt --statistics *.po\" in the base "
-"folder"
-
-#: catalogmanager/catalogmanagerview.cpp:1502
-msgid "Do you really want to delete the file %1?"
-msgstr "Do you really want to delete the file %1?"
-
-#: catalogmanager/catalogmanagerview.cpp:1507
-msgid "Was not able to delete the file %1!"
-msgstr "Was not able to delete the file %1!"
-
-#: catalogmanager/catalogmanagerview.cpp:1766
-msgid ""
-"You have not specified a valid folder for the base folder of the PO files:\n"
-"%1\n"
-"Please check your settings in the project settings dialog."
-msgstr ""
-"You have not specified a valid folder for the base folder of the PO files:\n"
-"%1\n"
-"Please check your settings in the project settings dialogue."
-
-#: catalogmanager/catalogmanagerview.cpp:1783
-msgid ""
-"You have not specified a valid folder for the base folder of the PO template "
-"files:\n"
-"%1\n"
-"Please check your settings in the project settings dialog."
-msgstr ""
-"You have not specified a valid folder for the base folder of the PO template "
-"files:\n"
-"%1\n"
-"Please check your settings in the project settings dialogue."
-
-#: catalogmanager/catalogmanagerview.cpp:1824
-msgid "Reading file information"
-msgstr "Reading file information"
-
-#: catalogmanager/catalogmanagerview.cpp:2999
-#: catalogmanager/validateprogress.cpp:98
-msgid ""
-"Cannot instantiate a validation tool.\n"
-"Please check your installation."
-msgstr ""
-"Cannot instantiate a validation tool.\n"
-"Please check your installation."
-
-#: catalogmanager/catalogmanagerview.cpp:3000
-#: catalogmanager/validateprogress.cpp:99
-msgid "Validation Tool Error"
-msgstr "Validation Tool Error"
-
-#: catalogmanager/catalogmanagerview.cpp:3008
-msgid "Validation Options"
-msgstr "Validation Options"
-
-#: catalogmanager/markpatterndialog.cpp:113
-msgid "Ma&rk files which match the following pattern:"
-msgstr "Ma&rk files which match the following pattern:"
-
-#: catalogmanager/markpatterndialog.cpp:114
-msgid "&Mark Files"
-msgstr "&Mark Files"
-
-#: catalogmanager/markpatterndialog.cpp:116
-msgid "Unma&rk files which match the following pattern:"
-msgstr "Unma&rk files which match the following pattern:"
-
-#: catalogmanager/markpatterndialog.cpp:117
-msgid "Un&mark Files"
-msgstr "Un&mark Files"
-
-#: catalogmanager/validateprogress.cpp:56
-msgid ""
-"_: Caption of dialog\n"
-"Validation"
-msgstr "Validation"
-
-#: catalogmanager/catalogmanager.cpp:222
-#: catalogmanager/validateprogress.cpp:72
-msgid "&Open"
-msgstr "&Open"
-
-#: catalogmanager/validateprogress.cpp:73
-msgid "&Ignore"
-msgstr "&Ignore"
-
-#: catalogmanager/validateprogress.cpp:186
-msgid ""
-"Validation done.\n"
-"\n"
-"Checked files: %1\n"
-"Number of errors: %2\n"
-"Number of ignored errors: %3"
-msgstr ""
-"Validation done.\n"
-"\n"
-"Checked files: %1\n"
-"Number of errors: %2\n"
-"Number of ignored errors: %3"
-
-#: catalogmanager/validateprogress.cpp:190
-msgid "Validation Done"
-msgstr "Validation Done"
-
-#: catalogmanager/main.cpp:178 kbabel/main.cpp:539
-msgid "File to load configuration from"
-msgstr "File to load configuration from"
-
-#: catalogmanager/main.cpp:186
-msgid "KBabel - Catalog Manager"
-msgstr "KBabel - Catalogue Manager"
-
-#: catalogmanager/main.cpp:187
-msgid "An advanced catalog manager for KBabel"
-msgstr "An advanced catalogue manager for KBabel"
-
-#: catalogmanager/main.cpp:188 kbabel/main.cpp:549
-msgid "(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"
-msgstr "(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"
-
-#: catalogmanager/main.cpp:190 kbabel/main.cpp:551 kbabeldict/main.cpp:118
-msgid "Original author"
-msgstr "Original author"
-
-#: catalogmanager/main.cpp:191 kbabel/main.cpp:558
-msgid "Current maintainer, porting to TDE3/Qt3."
-msgstr "Current maintainer, porting to TDE3/Qt3."
-
-#: catalogmanager/main.cpp:193 kbabel/main.cpp:564 kbabeldict/main.cpp:119
-msgid "Current maintainer"
-msgstr "Current maintainer"
-
-#: catalogmanager/main.cpp:195 kbabel/main.cpp:566
-msgid ""
-"Wrote documentation and sent many bug reports and suggestions for improvements."
-msgstr ""
-"Wrote documentation and sent many bug reports and suggestions for improvements."
-
-#: catalogmanager/main.cpp:198 kbabel/main.cpp:569
-msgid ""
-"Gave many suggestions for the GUI and the behavior of KBabel. He also "
-"contributed the beautiful splash screen."
-msgstr ""
-"Gave many suggestions for the GUI and the behaviour of KBabel. He also "
-"contributed the beautiful splash screen."
-
-#: catalogmanager/main.cpp:202 kbabel/main.cpp:553
-msgid "Wrote diff algorithm, fixed KSpell and gave a lot of useful hints."
-msgstr "Wrote diff algorithm, fixed KSpell and gave a lot of useful hints."
-
-#: catalogmanager/main.cpp:204 kbabel/main.cpp:572
-msgid ""
-"Helped keep KBabel up to date with the TDE API and gave a lot of other help."
-msgstr ""
-"Helped keep KBabel up to date with the TDE API and gave a lot of other help."
-
-#: catalogmanager/main.cpp:206 kbabel/main.cpp:576
-msgid "Various validation plugins."
-msgstr "Various validation plugins."
-
-#: catalogmanager/main.cpp:209 kbabel/main.cpp:579
-msgid "Sponsored development of KBabel for a while."
-msgstr "Sponsored development of KBabel for a while."
-
-#: catalogmanager/main.cpp:211
-msgid "Support for making diffs and some minor improvements."
-msgstr "Support for making diffs and some minor improvements."
-
-#: catalogmanager/main.cpp:214 kbabel/main.cpp:581
-msgid "KBabel contains code from Qt"
-msgstr "KBabel contains code from Qt"
-
-#: catalogmanager/main.cpp:216
-msgid "KBabel contains code from GNU gettext"
-msgstr "KBabel contains code from GNU gettext"
-
-#: catalogmanager/multiroughtransdlg.cpp:56
-msgid "Files:"
-msgstr "Files:"
-
-#: catalogmanager/multiroughtransdlg.cpp:84
-#: catalogmanager/multiroughtransdlg.cpp:96 kbabel/kbabelview.cpp:1182
-#: kbabel/kbabelview.cpp:1304 kbabel/kbabelview2.cpp:724
-msgid ""
-"Error while trying to read file:\n"
-" %1\n"
-"Maybe it is not a valid PO file."
-msgstr ""
-"Error while trying to read file:\n"
-" %1\n"
-"Maybe it is not a valid PO file."
-
-#: catalogmanager/multiroughtransdlg.cpp:129 commonui/roughtransdlg.cpp:671
-msgid ""
-"Result of the translation:\n"
-"Edited entries: %1\n"
-"Exact translations: %2 (%3%)\n"
-"Approximate translations: %4 (%5%)\n"
-"Nothing found: %6 (%7%)"
-msgstr ""
-"Result of the translation:\n"
-"Edited entries: %1\n"
-"Exact translations: %2 (%3%)\n"
-"Approximate translations: %4 (%5%)\n"
-"Nothing found: %6 (%7%)"
-
-#: catalogmanager/multiroughtransdlg.cpp:143 commonui/roughtransdlg.cpp:685
-msgid "Rough Translation Statistics"
-msgstr "Rough Translation Statistics"
-
-#: catalogmanager/libcvs/cvshandler.cpp:88
-msgid "No CVS repository"
-msgstr "No CVS repository"
-
-#: catalogmanager/libcvs/cvshandler.cpp:91
-msgid "Not in CVS"
-msgstr "Not in CVS"
-
-#: catalogmanager/libcvs/cvshandler.cpp:94
-#: catalogmanager/libsvn/svnhandler.cpp:96
-msgid "Locally added"
-msgstr "Locally added"
-
-#: catalogmanager/libcvs/cvshandler.cpp:97
-#: catalogmanager/libsvn/svnhandler.cpp:99
-msgid "Locally removed"
-msgstr "Locally removed"
-
-#: catalogmanager/libcvs/cvshandler.cpp:100
-#: catalogmanager/libsvn/svnhandler.cpp:102
-msgid "Locally modified"
-msgstr "Locally modified"
-
-#: catalogmanager/libcvs/cvshandler.cpp:103
-#: catalogmanager/libsvn/svnhandler.cpp:105
-msgid "Up-to-date"
-msgstr "Up-to-date"
-
-#: catalogmanager/libcvs/cvshandler.cpp:106
-#: catalogmanager/libsvn/svnhandler.cpp:108
-msgid "Conflict"
-msgstr "Conflict"
-
-#: catalogmanager/libcvs/cvshandler.cpp:109
-#: catalogmanager/libsvn/svnhandler.cpp:113
-msgid "Unknown"
-msgstr "Unknown"
-
-#: catalogmanager/libcvs/cvshandler.cpp:189
-#: catalogmanager/libcvs/cvshandler.cpp:228
-msgid ""
-"This is not a valid CVS repository. The CVS commands cannot be executed."
-msgstr ""
-"This is not a valid CVS repository. The CVS commands cannot be executed."
-
-#: catalogmanager/libcvs/cvsdialog.cpp:311
-#: catalogmanager/libcvs/cvshandler.cpp:375
-#: catalogmanager/libsvn/svndialog.cpp:290
-#: catalogmanager/libsvn/svnhandler.cpp:483
-msgid "[ Starting command ]"
-msgstr "[ Starting command ]"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:68
-msgid "CVS Dialog"
-msgstr "CVS Dialogue"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:77
-#: catalogmanager/libsvn/svndialog.cpp:74
-msgid "Update the following files:"
-msgstr "Update the following files:"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:80
-#: catalogmanager/libsvn/svndialog.cpp:77
-msgid "Commit the following files:"
-msgstr "Commit the following files:"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:83
-msgid "Get status for the following files:"
-msgstr "Get status for the following files:"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:86
-#: catalogmanager/libsvn/svndialog.cpp:86
-msgid "Get diff for the following files:"
-msgstr "Get diff for the following files:"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:100
-#: catalogmanager/libsvn/svndialog.cpp:103
-msgid "&Old messages:"
-msgstr "&Old messages:"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:108
-#: catalogmanager/libsvn/svndialog.cpp:111
-msgid "&Log message:"
-msgstr "&Log message:"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:114
-msgid "E&ncoding:"
-msgstr "E&ncoding:"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:121
-msgid ""
-"_: Descriptive encoding name\n"
-"Recommended ( %1 )"
-msgstr "Recommended (%1)"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:122
-msgid ""
-"_: Descriptive encoding name\n"
-"Locale ( %1 )"
-msgstr "Locale (%1)"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:133
-#: catalogmanager/libsvn/svndialog.cpp:124
-msgid "Auto&matically add files if necessary"
-msgstr "Auto&matically add files if necessary"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:144
-#: catalogmanager/libsvn/svndialog.cpp:135
-msgid "&Commit"
-msgstr "&Commit"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:147
-#: catalogmanager/libsvn/svndialog.cpp:139
-msgid "&Get Status"
-msgstr "&Get Status"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:150
-#: catalogmanager/libsvn/svndialog.cpp:142
-msgid "&Get Diff"
-msgstr "&Get Diff"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:157
-#: catalogmanager/libsvn/svndialog.cpp:152 commonui/roughtransdlg.cpp:83
-msgid "C&ancel"
-msgstr "C&ancel"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:165
-#: catalogmanager/libsvn/svndialog.cpp:160
-msgid "Command output:"
-msgstr "Command output:"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:237
-#: catalogmanager/libsvn/svndialog.cpp:233
-msgid "The commit log message is empty. Do you want to continue?"
-msgstr "The commit log message is empty. Do you want to continue?"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:247
-#, c-format
-msgid "Cannot find encoding: %1"
-msgstr "Cannot find encoding: %1"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:253
-msgid ""
-"The commit log message cannot be encoded in the selected encoding: %1.\n"
-"Do you want to continue?"
-msgstr ""
-"The commit log message cannot be encoded in the selected encoding: %1.\n"
-"Do you want to continue?"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:268
-#: catalogmanager/libsvn/svndialog.cpp:247
-msgid "Cannot open temporary file for writing. Aborting."
-msgstr "Cannot open temporary file for writing. Aborting."
-
-#: catalogmanager/libcvs/cvsdialog.cpp:280
-#: catalogmanager/libsvn/svndialog.cpp:259
-msgid "Cannot write to temporary file. Aborting."
-msgstr "Cannot write to temporary file. Aborting."
-
-#: catalogmanager/libcvs/cvsdialog.cpp:322
-#: catalogmanager/libsvn/svndialog.cpp:301
-msgid "The process could not be started."
-msgstr "The process could not be started."
-
-#: catalogmanager/libcvs/cvsdialog.cpp:351
-#: catalogmanager/libsvn/svndialog.cpp:330
-msgid "[ Exited with status %1 ]"
-msgstr "[ Exited with status %1 ]"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:353
-#: catalogmanager/libsvn/svndialog.cpp:332
-msgid "[ Finished ]"
-msgstr "[ Finished ]"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:358
-#: catalogmanager/libsvn/svndialog.cpp:337 kbabel/kbabel.cpp:642
-msgid "&Show Diff"
-msgstr "&Show Diff"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:401
-msgid ""
-"_: Descriptive encoding name\n"
-"Last choice ( %1 )"
-msgstr "Last choice (%1)"
-
-#: catalogmanager/libsvn/svndialog.cpp:65
-msgid "SVN Dialog"
-msgstr "SVN Dialogue"
-
-#: catalogmanager/libsvn/svndialog.cpp:80
-msgid "Get remote status for the following files:"
-msgstr "Get remote status for the following files:"
-
-#: catalogmanager/libsvn/svndialog.cpp:83
-msgid "Get local status for the following files:"
-msgstr "Get local status for the following files:"
-
-#: catalogmanager/libsvn/svndialog.cpp:89
-msgid "Get information for the following files:"
-msgstr "Get information for the following files:"
-
-#: catalogmanager/libsvn/svndialog.cpp:145
-msgid "&Get Information"
-msgstr "&Get Information"
-
-#: catalogmanager/libsvn/svnhandler.cpp:90
-msgid "No SVN repository"
-msgstr "No SVN repository"
-
-#: catalogmanager/libsvn/svnhandler.cpp:93
-msgid "Not in SVN"
-msgstr "Not in SVN"
-
-#: catalogmanager/libsvn/svnhandler.cpp:111
-msgid "Error in Working Copy"
-msgstr "Error in Working Copy"
-
-#: catalogmanager/libsvn/svnhandler.cpp:288
-msgid ""
-"This is not a valid SVN repository. The SVN commands cannot be executed."
-msgstr ""
-"This is not a valid SVN repository. The SVN commands cannot be executed."
-
-#: catalogmanager/findinfilesdialog.cpp:50
-msgid "File Options"
-msgstr "File Options"
-
-#: catalogmanager/findinfilesdialog.cpp:53
-msgid "&In all files"
-msgstr "&In all files"
-
-#: catalogmanager/findinfilesdialog.cpp:54
-msgid "&Marked files"
-msgstr "&Marked files"
-
-#: catalogmanager/findinfilesdialog.cpp:55
-msgid "In &templates"
-msgstr "In &templates"
-
-#: catalogmanager/findinfilesdialog.cpp:56
-msgid "Ask before ne&xt file"
-msgstr "Ask before ne&xt file"
-
-#: catalogmanager/findinfilesdialog.cpp:57
-msgid "Save &without asking"
-msgstr "Save &without asking"
-
-#: catalogmanager/findinfilesdialog.cpp:59
-msgid ""
-"<qt>"
-"<p><b>File Options</b></p>"
-"<p>Here you can finetune where to find:"
-"<ul>"
-"<li><b>In all files</b>: search in all files, otherwise searched is the "
-"selected file or files in the selected folder</li>"
-"<li><b>Ask before next file</b>: show a dialog asking to proceed to the next "
-"file</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<p><b>File Options</b></p>"
-"<p>Here you can finetune where to find:"
-"<ul>"
-"<li><b>In all files</b>: search in all files, otherwise searched is the "
-"selected file or files in the selected folder</li>"
-"<li><b>Ask before next file</b>: show a dialogue asking to proceed to the next "
-"file</li></ul></qt>"
-
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 78
-#: catalogmanager/future.cpp:4 rc.cpp:21 rc.cpp:39 rc.cpp:45
-#, no-c-format
-msgid "SVN"
-msgstr "SVN"
-
-#: catalogmanager/future.cpp:8
-msgid "Resolved"
-msgstr "Resolved"
-
-#: catalogmanager/future.cpp:9
-msgid "Resolved for Marked"
-msgstr "Resolved for Marked"
-
-#: catalogmanager/future.cpp:10
-msgid "Revert"
-msgstr "Revert"
-
-#: catalogmanager/future.cpp:11
-msgid "Revert for Marked"
-msgstr "Revert for Marked"
-
-#: catalogmanager/future.cpp:12
-msgid "Cleanup"
-msgstr "Cleanup"
-
-#: catalogmanager/future.cpp:13
-msgid "Cleanup for Marked"
-msgstr "Cleanup for Marked"
-
-#: catalogmanager/future.cpp:16
-msgid "No repository"
-msgstr "No repository"
-
-#: catalogmanager/catmanlistitem.cpp:80
-msgid "Message Catalogs"
-msgstr "Message Catalogues"
-
-#: catalogmanager/catmanlistitem.cpp:450 catalogmanager/catmanlistitem.cpp:637
-msgid "No version control"
-msgstr "No version control"
-
-#: catalogmanager/catalogmanager.cpp:129 kbabel/kbabel.cpp:132
-#: kbabel/kbabel.cpp:150 kbabel/kbabel.cpp:1754
-#, c-format
-msgid ""
-"Cannot open project file\n"
-"%1"
-msgstr ""
-"Cannot open project file\n"
-"%1"
-
-#: catalogmanager/catalogmanager.cpp:130 kbabel/kbabel.cpp:133
-#: kbabel/kbabel.cpp:151 kbabel/kbabel.cpp:1755
-msgid "Project File Error"
-msgstr "Project File Error"
-
-#: catalogmanager/catalogmanager.cpp:225
-msgid "&Open Template"
-msgstr "&Open Template"
-
-#: catalogmanager/catalogmanager.cpp:228
-msgid "Open in &New Window"
-msgstr "Open in &New Window"
-
-#: catalogmanager/catalogmanager.cpp:237
-msgid "Fi&nd in Files..."
-msgstr "Fi&nd in Files..."
-
-#: catalogmanager/catalogmanager.cpp:240
-msgid "Re&place in Files..."
-msgstr "Re&place in Files..."
-
-#: catalogmanager/catalogmanager.cpp:243 kbabel/kbabel.cpp:674
-msgid "&Stop Searching"
-msgstr "&Stop Searching"
-
-#: catalogmanager/catalogmanager.cpp:251
-msgid "&Toggle Marking"
-msgstr "&Toggle Marking"
-
-#: catalogmanager/catalogmanager.cpp:254
-msgid "Remove Marking"
-msgstr "Remove Marking"
-
-#: catalogmanager/catalogmanager.cpp:257
-msgid "Toggle All Markings"
-msgstr "Toggle All Markings"
-
-#: catalogmanager/catalogmanager.cpp:260
-msgid "Remove All Markings"
-msgstr "Remove All Markings"
-
-#: catalogmanager/catalogmanager.cpp:263
-msgid "Mark Modified Files"
-msgstr "Mark Modified Files"
-
-#: catalogmanager/catalogmanager.cpp:267
-msgid "&Load Markings..."
-msgstr "&Load Markings..."
-
-#: catalogmanager/catalogmanager.cpp:270
-msgid "&Save Markings..."
-msgstr "&Save Markings..."
-
-#: catalogmanager/catalogmanager.cpp:273
-msgid "&Mark Files..."
-msgstr "&Mark Files..."
-
-#: catalogmanager/catalogmanager.cpp:275
-msgid "&Unmark Files..."
-msgstr "&Unmark Files..."
-
-#: catalogmanager/catalogmanager.cpp:284 kbabel/kbabel.cpp:543
-msgid "Nex&t Untranslated"
-msgstr "Nex&t Untranslated"
-
-#: catalogmanager/catalogmanager.cpp:287 kbabel/kbabel.cpp:540
-msgid "Prev&ious Untranslated"
-msgstr "Prev&ious Untranslated"
-
-#: catalogmanager/catalogmanager.cpp:290 kbabel/kbabel.cpp:537
-msgid "Ne&xt Fuzzy"
-msgstr "Ne&xt Fuzzy"
-
-#: catalogmanager/catalogmanager.cpp:293 kbabel/kbabel.cpp:534
-msgid "Pre&vious Fuzzy"
-msgstr "Pre&vious Fuzzy"
-
-#: catalogmanager/catalogmanager.cpp:296 kbabel/kbabel.cpp:531
-msgid "N&ext Fuzzy or Untranslated"
-msgstr "N&ext Fuzzy or Untranslated"
-
-#: catalogmanager/catalogmanager.cpp:299 kbabel/kbabel.cpp:528
-msgid "P&revious Fuzzy or Untranslated"
-msgstr "P&revious Fuzzy or Untranslated"
-
-#: catalogmanager/catalogmanager.cpp:303 kbabel/kbabel.cpp:549
-msgid "Next Err&or"
-msgstr "Next Err&or"
-
-#: catalogmanager/catalogmanager.cpp:306 kbabel/kbabel.cpp:546
-msgid "Previo&us Error"
-msgstr "Previo&us Error"
-
-#: catalogmanager/catalogmanager.cpp:309
-msgid "Next Te&mplate Only"
-msgstr "Next Te&mplate Only"
-
-#: catalogmanager/catalogmanager.cpp:312
-msgid "Previous Temp&late Only"
-msgstr "Previous Temp&late Only"
-
-#: catalogmanager/catalogmanager.cpp:315
-msgid "Next Tran&slation Exists"
-msgstr "Next Tran&slation Exists"
-
-#: catalogmanager/catalogmanager.cpp:318
-msgid "Previous Transl&ation Exists"
-msgstr "Previous Transl&ation Exists"
-
-#: catalogmanager/catalogmanager.cpp:322
-msgid "Previous Marke&d"
-msgstr "Previous Marke&d"
-
-#: catalogmanager/catalogmanager.cpp:325
-msgid "Next &Marked"
-msgstr "Next &Marked"
-
-#: catalogmanager/catalogmanager.cpp:331 kbabel/kbabel.cpp:594
-msgid "&New..."
-msgstr "&New..."
-
-#: catalogmanager/catalogmanager.cpp:339 kbabel/kbabel.cpp:602
-msgid "C&lose"
-msgstr "C&lose"
-
-#: catalogmanager/catalogmanager.cpp:345 kbabel/kbabel.cpp:607
-msgid "&Configure..."
-msgstr "&Configure..."
-
-#: catalogmanager/catalogmanager.cpp:350
-msgid "&Statistics"
-msgstr "&Statistics"
-
-#: catalogmanager/catalogmanager.cpp:353
-msgid "S&tatistics in Marked"
-msgstr "S&tatistics in Marked"
-
-#: catalogmanager/catalogmanager.cpp:356
-msgid "Check S&yntax"
-msgstr "Check S&yntax"
-
-#: catalogmanager/catalogmanager.cpp:359
-msgid "S&pell Check"
-msgstr "S&pell Check"
-
-#: catalogmanager/catalogmanager.cpp:362
-msgid "Spell Check in &Marked"
-msgstr "Spell Check in &Marked"
-
-#: catalogmanager/catalogmanager.cpp:365
-msgid "&Rough Translation"
-msgstr "&Rough Translation"
-
-#: catalogmanager/catalogmanager.cpp:368
-msgid "Rough Translation in M&arked"
-msgstr "Rough Translation in M&arked"
-
-#: catalogmanager/catalogmanager.cpp:371
-msgid "Mai&l"
-msgstr "Mai&l"
-
-#: catalogmanager/catalogmanager.cpp:374
-msgid "Mail Mar&ked"
-msgstr "Mail Mar&ked"
-
-#: catalogmanager/catalogmanager.cpp:378
-msgid "&Pack"
-msgstr "&Pack"
-
-#: catalogmanager/catalogmanager.cpp:380
-msgid "Pack &Marked"
-msgstr "Pack &Marked"
-
-#: catalogmanager/catalogmanager.cpp:399 kbabel/kbabel.cpp:765
-msgid "&Validation"
-msgstr "&Validation"
-
-#: catalogmanager/catalogmanager.cpp:412
-msgid "V&alidation Marked"
-msgstr "V&alidation Marked"
-
-#: catalogmanager/catalogmanager.cpp:425 catalogmanager/catalogmanager.cpp:451
-msgid "Update"
-msgstr "Update"
-
-#: catalogmanager/catalogmanager.cpp:427 catalogmanager/catalogmanager.cpp:453
-msgid "Update Marked"
-msgstr "Update Marked"
-
-#: catalogmanager/catalogmanager.cpp:429 catalogmanager/catalogmanager.cpp:455
-msgid "Commit"
-msgstr "Commit"
-
-#: catalogmanager/catalogmanager.cpp:431 catalogmanager/catalogmanager.cpp:457
-msgid "Commit Marked"
-msgstr "Commit Marked"
-
-#: catalogmanager/catalogmanager.cpp:433
-msgid "Status"
-msgstr "Status"
-
-#: catalogmanager/catalogmanager.cpp:435
-msgid "Status for Marked"
-msgstr "Status for Marked"
-
-#: catalogmanager/catalogmanager.cpp:437 catalogmanager/catalogmanager.cpp:467
-msgid "Show Diff"
-msgstr "Show Diff"
-
-#: catalogmanager/catalogmanager.cpp:459
-msgid "Status (Local)"
-msgstr "Status (Local)"
-
-#: catalogmanager/catalogmanager.cpp:461
-msgid "Status (Local) for Marked"
-msgstr "Status (Local) for Marked"
-
-#: catalogmanager/catalogmanager.cpp:463
-msgid "Status (Remote)"
-msgstr "Status (Remote)"
-
-#: catalogmanager/catalogmanager.cpp:465
-msgid "Status (Remote) for Marked"
-msgstr "Status (Remote) for Marked"
-
-#: catalogmanager/catalogmanager.cpp:469
-msgid "Show Information"
-msgstr "Show Information"
-
-#: catalogmanager/catalogmanager.cpp:471
-msgid "Show Information for Marked"
-msgstr "Show Information for Marked"
-
-#: catalogmanager/catalogmanager.cpp:488 catalogmanager/catalogmanager.cpp:503
-msgid "Update Templates"
-msgstr "Update Templates"
-
-#: catalogmanager/catalogmanager.cpp:490 catalogmanager/catalogmanager.cpp:505
-msgid "Update Marked Templates"
-msgstr "Update Marked Templates"
-
-#: catalogmanager/catalogmanager.cpp:492 catalogmanager/catalogmanager.cpp:507
-msgid "Commit Templates"
-msgstr "Commit Templates"
-
-#: catalogmanager/catalogmanager.cpp:494 catalogmanager/catalogmanager.cpp:509
-msgid "Commit Marked Templates"
-msgstr "Commit Marked Templates"
-
-#: catalogmanager/catalogmanager.cpp:525 catalogmanager/catalogmanager.cpp:529
-msgid "Commands"
-msgstr "Commands"
-
-#: catalogmanager/catalogmanager.cpp:558
-msgid ""
-"<qt>"
-"<p><b>Statusbar</b></p>\n"
-"<p>The statusbar displays information about progress of the current find or "
-"replace operation. The first number in <b>Found:</b> "
-"displays the number of files with an occurrence of the searched text not yet "
-"shown in the KBabel window. The second shows the total number of files "
-"containing the searched text found so far.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Statusbar</b></p>\n"
-"<p>The statusbar displays information about progress of the current find or "
-"replace operation. The first number in <b>Found:</b> "
-"displays the number of files with an occurrence of the searched text not yet "
-"shown in the KBabel window. The second shows the total number of files "
-"containing the searched text found so far.</p></qt>"
-
-#: catalogmanager/catalogmanager.cpp:663 catalogmanager/catalogmanager.cpp:696
-#: catalogmanager/catalogmanager.cpp:727 catalogmanager/catalogmanager.cpp:757
-#: catalogmanager/catalogmanager.cpp:787 catalogmanager/catalogmanager.cpp:807
-#: catalogmanager/catalogmanager.cpp:827
-msgid ""
-"Cannot send a message to KBabel.\n"
-"Please check your installation of TDE."
-msgstr ""
-"Cannot send a message to KBabel.\n"
-"Please check your installation of TDE."
-
-#: catalogmanager/catalogmanager.cpp:858
-msgid ""
-"Unable to use TDELauncher to start KBabel.\n"
-"You should check the installation of TDE.\n"
-"Please start KBabel manually."
-msgstr ""
-"Unable to use TDELauncher to start KBabel.\n"
-"You should check the installation of TDE.\n"
-"Please start KBabel manually."
-
-#: catalogmanager/catalogmanager.cpp:893
-msgid "Found: 0/0"
-msgstr "Found: 0/0"
-
-#: catalogmanager/catalogmanager.cpp:915
-msgid "Found: %1/%2"
-msgstr "Found: %1/%2"
-
-#: catalogmanager/catalogmanager.cpp:940
-#: catalogmanager/catalogmanager.cpp:1024 kbabel/kbabelview.cpp:4433
-#: kbabeldict/kbabeldictview.cpp:239
-msgid "Searching"
-msgstr "Searching"
-
-#: catalogmanager/catalogmanager.cpp:986
-#: catalogmanager/catalogmanager.cpp:1073
-msgid "DCOP communication with KBabel failed."
-msgstr "DCOP communication with KBabel failed."
-
-#: catalogmanager/catalogmanager.cpp:986
-#: catalogmanager/catalogmanager.cpp:1073
-msgid "DCOP Communication Error"
-msgstr "DCOP Communication Error"
-
-#: catalogmanager/catalogmanager.cpp:1001
-#: catalogmanager/catalogmanager.cpp:1087
-msgid "KBabel cannot be started."
-msgstr "KBabel cannot be started."
-
-#: catalogmanager/catalogmanager.cpp:1001
-#: catalogmanager/catalogmanager.cpp:1087
-msgid "Cannot Start KBabel"
-msgstr "Cannot Start KBabel"
-
-#: catalogmanager/catalogmanager.cpp:1008
-#: catalogmanager/catalogmanager.cpp:1094
-msgid "Search string not found!"
-msgstr "Search string not found!"
-
-#: catalogmanager/catalogmanager.cpp:1235
-#, c-format
-msgid "Cannot open project file %1"
-msgstr "Cannot open project file %1"
-
-#: datatools/xml/main.cc:60
-msgid ""
-"_: what check found errors\n"
-"XML tags"
-msgstr "XML tags"
-
-#: datatools/context/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"context info"
-msgstr "context info"
-
-#: datatools/arguments/main.cc:57
-msgid ""
-"_: what check found errors\n"
-"arguments"
-msgstr "arguments"
-
-#: datatools/accelerators/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"accelerator"
-msgstr "accelerator"
-
-#: datatools/whitespace/main.cc:60
-msgid ""
-"_: which check found errors\n"
-"whitespace only translation"
-msgstr "whitespace only translation"
-
-#: datatools/length/main.cc:61 datatools/regexp/main.cc:55
-msgid ""
-"_: which check found errors\n"
-"translation has inconsistent length"
-msgstr "translation has inconsistent length"
-
-#: datatools/pluralforms/main.cc:59
-msgid ""
-"_: what check found errors\n"
-"plural forms"
-msgstr "plural forms"
-
-#: datatools/equations/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"equations"
-msgstr "equations"
-
-#: datatools/regexp/main.cc:58
-msgid "Error loading data (%1)"
-msgstr "Error loading data (%1)"
-
-#: datatools/regexp/main.cc:118
-msgid "File not found"
-msgstr "File not found"
-
-#: datatools/regexp/main.cc:123
-msgid "The file is not a XML"
-msgstr "The file is not a XML"
-
-#: datatools/regexp/main.cc:147
-msgid "Expected tag 'item'"
-msgstr "Expected tag 'item'"
-
-#: datatools/regexp/main.cc:153
-msgid "First child of 'item' is not a node"
-msgstr "First child of 'item' is not a node"
-
-#: datatools/regexp/main.cc:159
-msgid "Expected tag 'name'"
-msgstr "Expected tag 'name'"
-
-#: datatools/regexp/main.cc:167
-msgid "Expected tag 'exp'"
-msgstr "Expected tag 'exp'"
-
-#: datatools/not-translated/main.cc:60
-msgid ""
-"_: which check found errors\n"
-"English text in translation"
-msgstr "English text in translation"
-
-#: datatools/punctuation/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"punctuation"
-msgstr "punctuation"
-
-#: _translatorinfo.cpp:1 kbabeldict/main.cpp:121
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Malcolm Hunter"
-
-#: _translatorinfo.cpp:3 kbabeldict/main.cpp:122
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "malcolm.hunter@gmx.co.uk"
-
-#: filters/gettext/gettextexport.cpp:74
-msgid "saving file"
-msgstr "saving file"
-
-#: filters/gettext/gettextimport.cpp:83
-msgid "loading file"
-msgstr "loading file"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:50
-msgid "Catalog Information"
-msgstr "Catalogue Information"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:53
-msgid "Total Messages"
-msgstr "Total Messages"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:54
-msgid "Fuzzy Messages"
-msgstr "Fuzzy Messages"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:55
-msgid "Untranslated Messages"
-msgstr "Untranslated Messages"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:57
-msgid "Language Team"
-msgstr "Language Team"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:58
-msgid "Revision"
-msgstr "Revision"
-
-#: common/kbmailer.cpp:106
-#, c-format
-msgid "Error while trying to download file %1."
-msgstr "Error while trying to download file %1."
-
-#: common/kbmailer.cpp:145
-msgid "Enter the name of the archive without file extension"
-msgstr "Enter the name of the archive without file extension"
-
-#: common/kbmailer.cpp:178
-msgid "Error while trying to create archive file."
-msgstr "Error while trying to create archive file."
-
-#: common/kbmailer.cpp:193
-#, c-format
-msgid "Error while trying to read file %1."
-msgstr "Error while trying to read file %1."
-
-#: common/kbmailer.cpp:208
-msgid "Error while trying to copy file %1 into archive."
-msgstr "Error while trying to copy file %1 into archive."
-
-#: common/kbproject.cpp:53
-msgid "unnamed"
-msgstr "unnamed"
-
-#: common/catalog.cpp:592
-msgid ""
-"Free Software Foundation Copyright does not contain any year. It will not be "
-"updated."
-msgstr ""
-"Free Software Foundation Copyright does not contain any year. It will not be "
-"updated."
-
-#: common/catalog.cpp:1237
-msgid "validating file"
-msgstr "validating file"
-
-#: common/catalog.cpp:1276
-msgid "applying tool"
-msgstr "applying tool"
-
-#: common/catalog.cpp:3128
-msgid "searching matching message"
-msgstr "searching matching message"
-
-#: common/catalog.cpp:3217
-msgid "preparing messages for diff"
-msgstr "preparing messages for diff"
-
-#: commonui/roughtransdlg.cpp:69
-msgid ""
-"_: Caption of dialog\n"
-"Rough Translation"
-msgstr "Rough Translation"
-
-#: commonui/roughtransdlg.cpp:82 kbabeldict/kbabeldictview.cpp:111
-msgid "S&top"
-msgstr "S&top"
-
-#: commonui/roughtransdlg.cpp:96
-msgid "What to Translate"
-msgstr "What to Translate"
-
-#: commonui/roughtransdlg.cpp:102
-msgid "U&ntranslated entries"
-msgstr "U&ntranslated entries"
-
-#: commonui/roughtransdlg.cpp:103
-msgid "&Fuzzy entries"
-msgstr "&Fuzzy entries"
-
-#: commonui/roughtransdlg.cpp:104
-msgid "T&ranslated entries"
-msgstr "T&ranslated entries"
-
-#: commonui/roughtransdlg.cpp:108
-msgid ""
-"<qt>"
-"<p><b>What entries to translate</b></p>"
-"<p>Choose here, for which entries of the file KBabel tries to find a "
-"translation. Changed entries are always marked as fuzzy, no matter which option "
-"you choose.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>What entries to translate</b></p>"
-"<p>Choose here, for which entries of the file KBabel tries to find a "
-"translation. Changed entries are always marked as fuzzy, no matter which option "
-"you choose.</p></qt>"
-
-#: commonui/roughtransdlg.cpp:113
-msgid "How to Translate"
-msgstr "How to Translate"
-
-#: commonui/roughtransdlg.cpp:118
-msgid "&Use dictionary settings"
-msgstr "&Use dictionary settings"
-
-#: commonui/roughtransdlg.cpp:121
-msgid "Fu&zzy translation (slow)"
-msgstr "Fu&zzy translation (slow)"
-
-#: commonui/roughtransdlg.cpp:123
-msgid "&Single word translation"
-msgstr "&Single word translation"
-
-#: commonui/roughtransdlg.cpp:126
-msgid ""
-"<qt>"
-"<p><b>How messages get translated</b></p>"
-"<p>Here you can define if a message can only get translated completely, if "
-"similar messages are acceptable or if KBabel is supposed to try translating the "
-"single words of a message if no translation of the complete message or similar "
-"message was found.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>How messages get translated</b></p>"
-"<p>Here you can define if a message can only get translated completely, if "
-"similar messages are acceptable or if KBabel is supposed to try translating the "
-"single words of a message if no translation of the complete message or similar "
-"message was found.</p></qt>"
-
-#: commonui/roughtransdlg.cpp:136
-msgid "&Mark changed entries as fuzzy"
-msgstr "&Mark changed entries as fuzzy"
-
-#: commonui/roughtransdlg.cpp:139
-msgid ""
-"<qt>"
-"<p><b>Mark changed entries as fuzzy</b></p>"
-"<p>When a translation for a message is found, the entry will be marked <b>"
-"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
-"and you should always check the results carefully. Deactivate this option only "
-"if you know what you are doing.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Mark changed entries as fuzzy</b></p>"
-"<p>When a translation for a message is found, the entry will be marked <b>"
-"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
-"and you should always check the results carefully. Deactivate this option only "
-"if you know what you are doing.</p></qt>"
-
-#: commonui/roughtransdlg.cpp:150
-msgid "Initialize &TDE-specific entries"
-msgstr "Initialise &TDE-specific entries"
-
-#: commonui/roughtransdlg.cpp:153
-msgid ""
-"<qt>"
-"<p><b>Initialize TDE-specific entries</b></p>"
-"<p>Initialize \"Comment=\" and \"Name=\" entries if a translation is not found. "
-"Also, \"NAME OF TRANSLATORS\" and \"EMAIL OF TRANSLATORS\" is filled with "
-"identity settings.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Initialise TDE-specific entries</b></p>"
-"<p>Initialise \"Comment=\" and \"Name=\" entries if a translation is not found. "
-"Also, \"NAME OF TRANSLATORS\" and \"EMAIL OF TRANSLATORS\" is filled with "
-"identity settings.</p></qt>"
-
-#: commonui/roughtransdlg.cpp:158
-msgid "Dictionaries"
-msgstr "Dictionaries"
-
-#: commonui/roughtransdlg.cpp:177
-msgid ""
-"<qt>"
-"<p><b>Dictionaries</b></p>"
-"<p>Choose here, which dictionaries have to be used for finding a translation. "
-"If you select more than one dictionary, they are used in the same order as they "
-"are displayed in the list.</p>"
-"<p>The <b>Configure</b> button allows you to temporarily configure selected "
-"dictionary. The original settings will be restored after closing the dialog.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p><b>Dictionaries</b></p>"
-"<p>Choose here, which dictionaries have to be used for finding a translation. "
-"If you select more than one dictionary, they are used in the same order as they "
-"are displayed in the list.</p>"
-"<p>The <b>Configure</b> button allows you to temporarily configure selected "
-"dictionary. The original settings will be restored after closing the "
-"dialogue.</p></qt>"
-
-#: commonui/roughtransdlg.cpp:186
-msgid "Messages:"
-msgstr "Messages:"
+#: commonui/context.cpp:97
+msgid "Corresponding source file not found"
+msgstr "Corresponding source file not found"
 
-#: commonui/roughtransdlg.cpp:744
+#: commonui/context.cpp:265 commonui/context.cpp:275 commonui/context.cpp:285
 msgid ""
-"<qt>"
-"<p>When a translation for a message is found, the entry will be marked <b>"
-"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
-"and you should always check the results carefully. Deactivate this option only "
-"if you know what you are doing.</p></qt>"
+"KBabel cannot start a text editor component.\n"
+"Please check your TDE installation."
 msgstr ""
-"<qt>"
-"<p>When a translation for a message is found, the entry will be marked <b>"
-"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
-"and you should always check the results carefully. Deactivate this option only "
-"if you know what you are doing.</p></qt>"
-
-#: commonui/projectpref.cpp:70
-msgid ""
-"_: title of page in preferences dialog\n"
-"Identity"
-msgstr "Identity"
-
-#: commonui/projectpref.cpp:72
-msgid "Information About You and Translation Team"
-msgstr "Information About You and The Translation Team"
-
-#: commonui/projectpref.cpp:76 kbabel/kbabelview.cpp:1595
-msgid ""
-"_: title of page in preferences dialog\n"
-"Save"
-msgstr "Save"
-
-#: commonui/projectpref.cpp:78 kbabel/kbabelview.cpp:1597
-msgid "Options for File Saving"
-msgstr "Options for File Saving"
-
-#: commonui/projectpref.cpp:82
-msgid ""
-"_: title of page in preferences dialog\n"
-"Spelling"
-msgstr "Spelling"
-
-#: commonui/projectpref.cpp:84
-msgid "Options for Spell Checking"
-msgstr "Options for Spell Checking"
-
-#: commonui/projectpref.cpp:89
-msgid ""
-"_: title of page in preferences dialog\n"
-"Source"
-msgstr "Source"
-
-#: commonui/projectpref.cpp:91
-msgid "Options for Showing Source Context"
-msgstr "Options for Showing Source Context"
-
-#: commonui/projectpref.cpp:96
-msgid ""
-"_: title of page in preferences dialog\n"
-"Miscellaneous"
-msgstr "Miscellaneous"
-
-#: commonui/projectpref.cpp:98
-msgid "Miscellaneous Settings"
-msgstr "Miscellaneous Settings"
-
-#: commonui/projectpref.cpp:101
-msgid ""
-"_: title of page in preferences dialog\n"
-"Folders"
-msgstr "Folders"
-
-#: commonui/projectpref.cpp:103
-msgid "Paths to Message Catalogs & Catalog Templates"
-msgstr "Paths to Message Catalogues & Catalogue Templates"
-
-#: commonui/projectpref.cpp:106
-msgid ""
-"_: title of page in preferences dialog\n"
-"Folder Commands"
-msgstr "Folder Commands"
-
-#: commonui/projectpref.cpp:108
-msgid "User-Defined Commands for Folder Items"
-msgstr "User-Defined Commands for Folder Items"
-
-#: commonui/projectpref.cpp:113
-msgid ""
-"_: title of page in preferences dialog\n"
-"File Commands"
-msgstr "File Commands"
-
-#: commonui/projectpref.cpp:115
-msgid "User-Defined Commands for File Items"
-msgstr "User-Defined Commands for File Items"
-
-#: commonui/projectpref.cpp:120
-msgid ""
-"_: title of page in preferences dialog\n"
-"Catalog Manager"
-msgstr "Catalogue Manager"
-
-#: commonui/projectpref.cpp:122
-msgid "Catalog Manager View Settings"
-msgstr "Catalogue Manager View Settings"
-
-#: commonui/projectpref.cpp:125 kbabel/kbabelpref.cpp:85
-msgid ""
-"_: title of page in preferences dialog\n"
-"Diff"
-msgstr "Diff"
-
-#: commonui/projectpref.cpp:127
-msgid "Searching for Differences"
-msgstr "Searching for Differences"
+"KBabel cannot start a text editor component.\n"
+"Please check your TDE installation."
 
 #: commonui/cmdedit.cpp:51
 msgid "Command &Label:"
@@ -1625,34 +41,6 @@ msgstr "Co&mmand:"
 msgid "&Add"
 msgstr "&Add"
 
-#: commonui/tdeactionselector.cpp:81
-msgid "&Available:"
-msgstr "&Available:"
-
-#: commonui/tdeactionselector.cpp:96
-msgid "&Selected:"
-msgstr "&Selected:"
-
-#: commonui/projectwizard.cpp:78
-msgid "Basic Project Information"
-msgstr "Basic Project Information"
-
-#: commonui/projectwizard.cpp:83
-msgid "Translation Files"
-msgstr "Translation Files"
-
-#: commonui/projectwizard.cpp:140
-msgid ""
-"The file '%1' already exists.\n"
-"Do you want to replace it?"
-msgstr ""
-"The file '%1' already exists.\n"
-"Do you want to replace it?"
-
-#: commonui/projectwizard.cpp:141
-msgid "File Exists"
-msgstr "File Exists"
-
 #: commonui/finddialog.cpp:62
 msgid "&Find:"
 msgstr "&Find:"
@@ -1726,7 +114,7 @@ msgstr ""
 "<p>Select here in which parts of a catalogue entry you want to search.</p></qt>"
 
 #. i18n: file ./catalogmanager/markpatternwidget.ui line 54
-#: commonui/finddialog.cpp:124 rc.cpp:69
+#: commonui/finddialog.cpp:124 rc.cpp:1219
 #, no-c-format
 msgid "C&ase sensitive"
 msgstr "C&ase sensitive"
@@ -1752,7 +140,7 @@ msgid "F&ind backwards"
 msgstr "F&ind backwards"
 
 #. i18n: file ./catalogmanager/markpatternwidget.ui line 86
-#: commonui/finddialog.cpp:133 rc.cpp:81
+#: commonui/finddialog.cpp:133 rc.cpp:1231
 #, no-c-format
 msgid "Use regu&lar expression"
 msgstr "Use regu&lar expression"
@@ -1892,7 +280,7 @@ msgid "No autosave"
 msgstr "No autosave"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 29
-#: commonui/projectprefwidgets.cpp:188 rc.cpp:420
+#: commonui/projectprefwidgets.cpp:188 rc.cpp:271
 #, no-c-format
 msgid "&General"
 msgstr "&General"
@@ -2291,11 +679,12 @@ msgid "&Marker for keyboard accelerator:"
 msgstr "&Marker for keyboard accelerator:"
 
 #: commonui/projectprefwidgets.cpp:682
+#, fuzzy
 msgid ""
 "<qt>"
 "<p><b>Marker for keyboard accelerator</b></p>"
 "<p>Define here, what character marks the following character as keyboard "
-"accelerator. For example in Qt it is '&amp;' and in Gtk it is '_'.</p></qt>"
+"accelerator. For example in TQt it is '&amp;' and in Gtk it is '_'.</p></qt>"
 msgstr ""
 "<qt>"
 "<p><b>Marker for keyboard accelerator</b></p>"
@@ -2371,13 +760,13 @@ msgstr ""
 "Ignore All</i> in the spell check dialogue, in every spell check.</p></qt>"
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 68
-#: commonui/projectprefwidgets.cpp:890 rc.cpp:313
+#: commonui/projectprefwidgets.cpp:890 rc.cpp:199
 #, no-c-format
 msgid "&Base folder of PO files:"
 msgstr "&Base folder of PO files:"
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 110
-#: commonui/projectprefwidgets.cpp:903 rc.cpp:316
+#: commonui/projectprefwidgets.cpp:903 rc.cpp:202
 #, no-c-format
 msgid "Ba&se folder of POT files:"
 msgstr "Ba&se folder of POT files:"
@@ -2626,251 +1015,437 @@ msgstr "&Base folder for source code:"
 msgid "Path Patterns"
 msgstr "Path Patterns"
 
-#: commonui/context.cpp:97
-msgid "Corresponding source file not found"
-msgstr "Corresponding source file not found"
+#: commonui/tdeactionselector.cpp:81
+msgid "&Available:"
+msgstr "&Available:"
 
-#: commonui/context.cpp:265 commonui/context.cpp:275 commonui/context.cpp:285
+#: commonui/tdeactionselector.cpp:96
+msgid "&Selected:"
+msgstr "&Selected:"
+
+#: commonui/projectpref.cpp:70
 msgid ""
-"KBabel cannot start a text editor component.\n"
-"Please check your TDE installation."
-msgstr ""
-"KBabel cannot start a text editor component.\n"
-"Please check your TDE installation."
+"_: title of page in preferences dialog\n"
+"Identity"
+msgstr "Identity"
 
-#. i18n: file ./kbabel/headerwidget.ui line 24
-#: kbabel/commentview.cpp:78 rc.cpp:414
-#, no-c-format
-msgid "&Comment:"
-msgstr "&Comment:"
+#: commonui/projectpref.cpp:72
+msgid "Information About You and Translation Team"
+msgstr "Information About You and The Translation Team"
 
-#: kbabel/commentview.cpp:88
+#: commonui/projectpref.cpp:76 kbabel/kbabelview.cpp:1595
 msgid ""
-"<qt>"
-"<p><b>Comment Editor</b></p>\n"
-"This edit window shows you the comments of the currently displayed message."
-"<p>\n"
-"<p>The comments normally contain information about where the message is found "
-"in the source\n"
-"code and status information about this message (fuzzy, c-format).\n"
-"Hints from other translators are also sometimes contained in comments.</p>\n"
-"<p>You can hide the comment editor by deactivating\n"
-"<b>Options->Show Comments</b>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Comment Editor</b></p>\n"
-"This edit window shows you the comments of the currently displayed message."
-"<p>\n"
-"<p>The comments normally contain information about where the message is found "
-"in the source\n"
-"code and status information about this message (fuzzy, c-format).\n"
-"Hints from other translators are also sometimes contained in comments.</p>\n"
-"<p>You can hide the comment editor by deactivating\n"
-"<b>Options->Show Comments</b>.</p></qt>"
+"_: title of page in preferences dialog\n"
+"Save"
+msgstr "Save"
 
-#: kbabel/contextview.cpp:63
-msgid ""
-"<qt>"
-"<p><b>PO Context</b></p>"
-"<p>This window shows the context of the current message in the PO file. "
-"Normally it shows four messages in front of the current message and four after "
-"it.</p>"
-"<p>You can hide the tools window by deactivating <b>Options->Show Tools</b>.</p>"
-"</qt></qt>"
-msgstr ""
-"<qt>"
-"<p><b>PO Context</b></p>"
-"<p>This window shows the context of the current message in the PO file. "
-"Normally it shows four messages in front of the current message and four after "
-"it.</p>"
-"<p>You can hide the tools window by deactivating <b>Options->Show Tools</b>.</p>"
-"</qt></qt>"
+#: commonui/projectpref.cpp:78 kbabel/kbabelview.cpp:1597
+msgid "Options for File Saving"
+msgstr "Options for File Saving"
 
-#: kbabel/contextview.cpp:99
-msgid "current entry"
-msgstr "current entry"
+#: commonui/projectpref.cpp:82
+msgid ""
+"_: title of page in preferences dialog\n"
+"Spelling"
+msgstr "Spelling"
 
-#: kbabel/contextview.cpp:125 kbabel/kbabel.cpp:721 kbabel/kbabelview.cpp:419
-msgid "untranslated"
-msgstr "untranslated"
+#: commonui/projectpref.cpp:84
+msgid "Options for Spell Checking"
+msgstr "Options for Spell Checking"
 
-#: kbabel/contextview.cpp:140
+#: commonui/projectpref.cpp:89
 msgid ""
-"Plural %1: %2\n"
-msgstr ""
-"Plural %1: %2\n"
+"_: title of page in preferences dialog\n"
+"Source"
+msgstr "Source"
 
-#: kbabel/errorlistview.cpp:62
-msgid ""
-"<qt>"
-"<p><b>Error List</b></p>"
-"<p>This window shows the list of errors found by validator tools so you can "
-"know why the current message has been marked with an error.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Error List</b></p>"
-"<p>This window shows the list of errors found by validator tools so you can "
-"know why the current message has been marked with an error.</p></qt>"
+#: commonui/projectpref.cpp:91
+msgid "Options for Showing Source Context"
+msgstr "Options for Showing Source Context"
 
-#: kbabel/kbabelpref.cpp:57
+#: commonui/projectpref.cpp:96
 msgid ""
 "_: title of page in preferences dialog\n"
-"Edit"
-msgstr "Edit"
+"Miscellaneous"
+msgstr "Miscellaneous"
 
-#: kbabel/kbabelpref.cpp:59
-msgid "Options for Editing"
-msgstr "Options for Editing"
+#: commonui/projectpref.cpp:98
+msgid "Miscellaneous Settings"
+msgstr "Miscellaneous Settings"
 
-#: kbabel/kbabelpref.cpp:70
+#: commonui/projectpref.cpp:101
 msgid ""
 "_: title of page in preferences dialog\n"
-"Search"
-msgstr "Search"
-
-#: kbabel/kbabelpref.cpp:72
-msgid "Options for Searching Similar Translations"
-msgstr "Options for Searching Similar Translations"
+"Folders"
+msgstr "Folders"
 
-#: kbabel/kbabelpref.cpp:87
-msgid "Options for Showing Differences"
-msgstr "Options for Showing Differences"
+#: commonui/projectpref.cpp:103
+msgid "Paths to Message Catalogs & Catalog Templates"
+msgstr "Paths to Message Catalogues & Catalogue Templates"
 
-#: kbabel/kbabelpref.cpp:90
+#: commonui/projectpref.cpp:106
 msgid ""
-"_: name of page in preferences dialog icon list\n"
-"Fonts"
-msgstr "Fonts"
+"_: title of page in preferences dialog\n"
+"Folder Commands"
+msgstr "Folder Commands"
 
-#: kbabel/kbabelpref.cpp:92
+#: commonui/projectpref.cpp:108
+msgid "User-Defined Commands for Folder Items"
+msgstr "User-Defined Commands for Folder Items"
+
+#: commonui/projectpref.cpp:113
 msgid ""
 "_: title of page in preferences dialog\n"
-"Font Settings"
-msgstr "Font Settings"
+"File Commands"
+msgstr "File Commands"
 
-#: kbabel/kbabelpref.cpp:95
+#: commonui/projectpref.cpp:115
+msgid "User-Defined Commands for File Items"
+msgstr "User-Defined Commands for File Items"
+
+#: commonui/projectpref.cpp:120
 msgid ""
-"_: name of page in preferences dialog icon list\n"
-"Colors"
-msgstr "Colours"
+"_: title of page in preferences dialog\n"
+"Catalog Manager"
+msgstr "Catalogue Manager"
 
-#: kbabel/kbabelpref.cpp:97
+#: commonui/projectpref.cpp:122
+msgid "Catalog Manager View Settings"
+msgstr "Catalogue Manager View Settings"
+
+#: commonui/projectpref.cpp:125 kbabel/kbabelpref.cpp:85
 msgid ""
 "_: title of page in preferences dialog\n"
-"Color Settings"
-msgstr "Colour Settings"
+"Diff"
+msgstr "Diff"
 
-#: kbabel/kbcataloglistview.cpp:44
-msgid "Id"
-msgstr "Id"
+#: commonui/projectpref.cpp:127
+msgid "Searching for Differences"
+msgstr "Searching for Differences"
 
-#: kbabel/kbcataloglistview.cpp:45
-msgid "Original String"
-msgstr "Original String"
+#: commonui/roughtransdlg.cpp:69
+msgid ""
+"_: Caption of dialog\n"
+"Rough Translation"
+msgstr "Rough Translation"
 
-#. i18n: translators: Dock window caption
-#: kbabel/kbabelview.cpp:456 kbabel/kbcataloglistview.cpp:46
-msgid "Translated String"
-msgstr "Translated String"
+#: commonui/roughtransdlg.cpp:82 kbabeldict/kbabeldictview.cpp:111
+msgid "S&top"
+msgstr "S&top"
 
-#: kbabel/main.cpp:537
-msgid "Go to entry with msgid <msgid>"
-msgstr "Go to entry with msgid <msgid>"
+#: catalogmanager/libcvs/cvsdialog.cpp:157
+#: catalogmanager/libsvn/svndialog.cpp:152 commonui/roughtransdlg.cpp:83
+msgid "C&ancel"
+msgstr "C&ancel"
 
-#: kbabel/main.cpp:538 kbabeldict/main.cpp:105
-msgid "Disable splashscreen at startup"
-msgstr "Disable splashscreen at startup"
+#: commonui/roughtransdlg.cpp:96
+msgid "What to Translate"
+msgstr "What to Translate"
 
-#: kbabel/main.cpp:540
-msgid "Files to open"
-msgstr "Files to open"
+#: commonui/roughtransdlg.cpp:102
+msgid "U&ntranslated entries"
+msgstr "U&ntranslated entries"
 
-#: kbabel/main.cpp:547
-msgid "KBabel"
-msgstr "KBabel"
+#: commonui/roughtransdlg.cpp:103
+msgid "&Fuzzy entries"
+msgstr "&Fuzzy entries"
 
-#: kbabel/main.cpp:548
-msgid "An advanced PO file editor"
-msgstr "An advanced PO file editor"
+#: commonui/roughtransdlg.cpp:104
+msgid "T&ranslated entries"
+msgstr "T&ranslated entries"
 
-#: kbabel/main.cpp:555
+#: commonui/roughtransdlg.cpp:108
 msgid ""
-"Wrote the dictionary plugin for searching in a database and some other code."
+"<qt>"
+"<p><b>What entries to translate</b></p>"
+"<p>Choose here, for which entries of the file KBabel tries to find a "
+"translation. Changed entries are always marked as fuzzy, no matter which option "
+"you choose.</p></qt>"
 msgstr ""
-"Wrote the dictionary plugin for searching in a database and some other code."
-
-#: kbabel/main.cpp:560
-msgid "Bug fixes, KFilePlugin for PO files, CVS support, mailing files"
-msgstr "Bug fixes, KFilePlugin for PO files, CVS support, mailing files"
+"<qt>"
+"<p><b>What entries to translate</b></p>"
+"<p>Choose here, for which entries of the file KBabel tries to find a "
+"translation. Changed entries are always marked as fuzzy, no matter which option "
+"you choose.</p></qt>"
 
-#: kbabel/main.cpp:562
-msgid "Translation List View"
-msgstr "Translation List View"
+#: commonui/roughtransdlg.cpp:113
+msgid "How to Translate"
+msgstr "How to Translate"
 
-#: kbabel/main.cpp:574
-msgid "Implemented XML validation/highlighting plus other small fixes."
-msgstr "Implemented XML validation/highlighting plus other small fixes."
+#: commonui/roughtransdlg.cpp:118
+msgid "&Use dictionary settings"
+msgstr "&Use dictionary settings"
 
-#: kbabel/main.cpp:583
-#, fuzzy
-msgid "String distance algorithm implementation"
-msgstr "String difference algorithm implementation"
+#: commonui/roughtransdlg.cpp:121
+msgid "Fu&zzy translation (slow)"
+msgstr "Fu&zzy translation (slow)"
 
-#: kbabel/main.cpp:585
-msgid "Error list for current entry, regexp data tool"
-msgstr "Error list for current entry, regexp data tool"
+#: commonui/roughtransdlg.cpp:123
+msgid "&Single word translation"
+msgstr "&Single word translation"
 
-#: kbabel/main.cpp:587
-#, fuzzy
-msgid "Word-by-word string difference algorithm implementation"
-msgstr "String difference algorithm implementation"
+#: commonui/roughtransdlg.cpp:126
+msgid ""
+"<qt>"
+"<p><b>How messages get translated</b></p>"
+"<p>Here you can define if a message can only get translated completely, if "
+"similar messages are acceptable or if KBabel is supposed to try translating the "
+"single words of a message if no translation of the complete message or similar "
+"message was found.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>How messages get translated</b></p>"
+"<p>Here you can define if a message can only get translated completely, if "
+"similar messages are acceptable or if KBabel is supposed to try translating the "
+"single words of a message if no translation of the complete message or similar "
+"message was found.</p></qt>"
 
-#: kbabel/headereditor.cpp:60
-msgid "&Apply Settings"
-msgstr "&Apply Settings"
+#: commonui/roughtransdlg.cpp:136
+msgid "&Mark changed entries as fuzzy"
+msgstr "&Mark changed entries as fuzzy"
 
-#: kbabel/headereditor.cpp:61
+#: commonui/roughtransdlg.cpp:139
 msgid ""
 "<qt>"
-"<p>This button updates the header using the current settings. The resulting "
-"header is the one that would be written into the PO file on saving.</p></qt>"
+"<p><b>Mark changed entries as fuzzy</b></p>"
+"<p>When a translation for a message is found, the entry will be marked <b>"
+"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
+"and you should always check the results carefully. Deactivate this option only "
+"if you know what you are doing.</p></qt>"
 msgstr ""
 "<qt>"
-"<p>This button updates the header using the current settings. The resulting "
-"header is the one that would be written into the PO file on saving.</p></qt>"
+"<p><b>Mark changed entries as fuzzy</b></p>"
+"<p>When a translation for a message is found, the entry will be marked <b>"
+"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
+"and you should always check the results carefully. Deactivate this option only "
+"if you know what you are doing.</p></qt>"
 
-#: kbabel/headereditor.cpp:65
-msgid "&Reset"
-msgstr "&Reset"
+#: commonui/roughtransdlg.cpp:150
+msgid "Initialize &TDE-specific entries"
+msgstr "Initialise &TDE-specific entries"
 
-#: kbabel/headereditor.cpp:66
-msgid "<qt><p>This button will revert all changes made so far.</p></qt>"
-msgstr "<qt><p>This button will revert all changes made so far.</p></qt>"
+#: commonui/roughtransdlg.cpp:153
+msgid ""
+"<qt>"
+"<p><b>Initialize TDE-specific entries</b></p>"
+"<p>Initialize \"Comment=\" and \"Name=\" entries if a translation is not found. "
+"Also, \"NAME OF TRANSLATORS\" and \"EMAIL OF TRANSLATORS\" is filled with "
+"identity settings.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Initialise TDE-specific entries</b></p>"
+"<p>Initialise \"Comment=\" and \"Name=\" entries if a translation is not found. "
+"Also, \"NAME OF TRANSLATORS\" and \"EMAIL OF TRANSLATORS\" is filled with "
+"identity settings.</p></qt>"
 
-#: kbabel/headereditor.cpp:111
-#, c-format
-msgid "Header Editor for %1"
-msgstr "Header Editor for %1"
+#: commonui/roughtransdlg.cpp:158
+msgid "Dictionaries"
+msgstr "Dictionaries"
 
-#: kbabel/headereditor.cpp:136
+#: commonui/roughtransdlg.cpp:177
 msgid ""
 "<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating!</p></qt>"
+"<p><b>Dictionaries</b></p>"
+"<p>Choose here, which dictionaries have to be used for finding a translation. "
+"If you select more than one dictionary, they are used in the same order as they "
+"are displayed in the list.</p>"
+"<p>The <b>Configure</b> button allows you to temporarily configure selected "
+"dictionary. The original settings will be restored after closing the dialog.</p>"
+"</qt>"
 msgstr ""
 "<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating!</p></qt>"
+"<p><b>Dictionaries</b></p>"
+"<p>Choose here, which dictionaries have to be used for finding a translation. "
+"If you select more than one dictionary, they are used in the same order as they "
+"are displayed in the list.</p>"
+"<p>The <b>Configure</b> button allows you to temporarily configure selected "
+"dictionary. The original settings will be restored after closing the "
+"dialogue.</p></qt>"
 
-#: kbabel/headereditor.cpp:172
+#: commonui/roughtransdlg.cpp:186
+msgid "Messages:"
+msgstr "Messages:"
+
+#: catalogmanager/multiroughtransdlg.cpp:129 commonui/roughtransdlg.cpp:671
+msgid ""
+"Result of the translation:\n"
+"Edited entries: %1\n"
+"Exact translations: %2 (%3%)\n"
+"Approximate translations: %4 (%5%)\n"
+"Nothing found: %6 (%7%)"
+msgstr ""
+"Result of the translation:\n"
+"Edited entries: %1\n"
+"Exact translations: %2 (%3%)\n"
+"Approximate translations: %4 (%5%)\n"
+"Nothing found: %6 (%7%)"
+
+#: catalogmanager/multiroughtransdlg.cpp:143 commonui/roughtransdlg.cpp:685
+msgid "Rough Translation Statistics"
+msgstr "Rough Translation Statistics"
+
+#: commonui/roughtransdlg.cpp:744
 msgid ""
 "<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating.</p></qt>"
+"<p>When a translation for a message is found, the entry will be marked <b>"
+"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
+"and you should always check the results carefully. Deactivate this option only "
+"if you know what you are doing.</p></qt>"
 msgstr ""
 "<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating.</p></qt>"
+"<p>When a translation for a message is found, the entry will be marked <b>"
+"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
+"and you should always check the results carefully. Deactivate this option only "
+"if you know what you are doing.</p></qt>"
+
+#: commonui/projectwizard.cpp:78
+msgid "Basic Project Information"
+msgstr "Basic Project Information"
+
+#: commonui/projectwizard.cpp:83
+msgid "Translation Files"
+msgstr "Translation Files"
+
+#: commonui/projectwizard.cpp:140
+msgid ""
+"The file '%1' already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"The file '%1' already exists.\n"
+"Do you want to replace it?"
+
+#: commonui/projectwizard.cpp:141
+msgid "File Exists"
+msgstr "File Exists"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:50
+msgid "Catalog Information"
+msgstr "Catalogue Information"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:53
+msgid "Total Messages"
+msgstr "Total Messages"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:54
+msgid "Fuzzy Messages"
+msgstr "Fuzzy Messages"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:55
+msgid "Untranslated Messages"
+msgstr "Untranslated Messages"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:56
+#: catalogmanager/catalogmanagerview.cpp:96
+msgid "Last Translator"
+msgstr "Last Translator"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:57
+msgid "Language Team"
+msgstr "Language Team"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:58
+msgid "Revision"
+msgstr "Revision"
+
+#: _translatorinfo.cpp:1 kbabeldict/main.cpp:121
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Malcolm Hunter"
+
+#: _translatorinfo.cpp:3 kbabeldict/main.cpp:122
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "malcolm.hunter@gmx.co.uk"
+
+#: datatools/punctuation/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"punctuation"
+msgstr "punctuation"
+
+#: datatools/whitespace/main.cc:60
+msgid ""
+"_: which check found errors\n"
+"whitespace only translation"
+msgstr "whitespace only translation"
+
+#: datatools/equations/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"equations"
+msgstr "equations"
+
+#: datatools/not-translated/main.cc:60
+msgid ""
+"_: which check found errors\n"
+"English text in translation"
+msgstr "English text in translation"
+
+#: datatools/xml/main.cc:60
+msgid ""
+"_: what check found errors\n"
+"XML tags"
+msgstr "XML tags"
+
+#: datatools/accelerators/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"accelerator"
+msgstr "accelerator"
+
+#: datatools/length/main.cc:61 datatools/regexp/main.cc:55
+msgid ""
+"_: which check found errors\n"
+"translation has inconsistent length"
+msgstr "translation has inconsistent length"
+
+#: datatools/regexp/main.cc:58
+msgid "Error loading data (%1)"
+msgstr "Error loading data (%1)"
+
+#: datatools/regexp/main.cc:118
+msgid "File not found"
+msgstr "File not found"
+
+#: datatools/regexp/main.cc:123
+msgid "The file is not a XML"
+msgstr "The file is not a XML"
+
+#: datatools/regexp/main.cc:147
+msgid "Expected tag 'item'"
+msgstr "Expected tag 'item'"
+
+#: datatools/regexp/main.cc:153
+msgid "First child of 'item' is not a node"
+msgstr "First child of 'item' is not a node"
+
+#: datatools/regexp/main.cc:159
+msgid "Expected tag 'name'"
+msgstr "Expected tag 'name'"
+
+#: datatools/regexp/main.cc:167
+msgid "Expected tag 'exp'"
+msgstr "Expected tag 'exp'"
+
+#: datatools/pluralforms/main.cc:59
+msgid ""
+"_: what check found errors\n"
+"plural forms"
+msgstr "plural forms"
+
+#: datatools/context/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"context info"
+msgstr "context info"
+
+#: datatools/arguments/main.cc:57
+msgid ""
+"_: what check found errors\n"
+"arguments"
+msgstr "arguments"
 
 #: kbabel/kbabelview.cpp:185
 msgid ""
@@ -2990,6 +1565,10 @@ msgstr "Trans&lated string (msgstr):"
 msgid "fuzzy"
 msgstr "fuzzy"
 
+#: kbabel/contextview.cpp:125 kbabel/kbabel.cpp:721 kbabel/kbabelview.cpp:419
+msgid "untranslated"
+msgstr "untranslated"
+
 #: kbabel/kbabel.cpp:725 kbabel/kbabelview.cpp:428
 msgid "faulty"
 msgstr "faulty"
@@ -3023,6 +1602,11 @@ msgstr ""
 "<p></qt>"
 
 #. i18n: translators: Dock window caption
+#: kbabel/kbabelview.cpp:456 kbabel/kbcataloglistview.cpp:46
+msgid "Translated String"
+msgstr "Translated String"
+
+#. i18n: translators: Dock window caption
 #: kbabel/kbabelview.cpp:466
 msgid ""
 "_: the search (noun)\n"
@@ -3100,6 +1684,18 @@ msgid ""
 msgstr ""
 "There was an error while reading the file header. Please check the header."
 
+#: catalogmanager/multiroughtransdlg.cpp:84
+#: catalogmanager/multiroughtransdlg.cpp:96 kbabel/kbabelview.cpp:1182
+#: kbabel/kbabelview.cpp:1304 kbabel/kbabelview2.cpp:724
+msgid ""
+"Error while trying to read file:\n"
+" %1\n"
+"Maybe it is not a valid PO file."
+msgstr ""
+"Error while trying to read file:\n"
+" %1\n"
+"Maybe it is not a valid PO file."
+
 #: kbabel/kbabelview.cpp:1189 kbabel/kbabelview.cpp:1311
 msgid ""
 "Error while reading the file:\n"
@@ -3158,6 +1754,17 @@ msgstr ""
 "The import plugin cannot handle this type of the file:\n"
 " %1"
 
+#: catalogmanager/catalogmanagerview.cpp:448
+#: catalogmanager/catalogmanagerview.cpp:483 kbabel/kbabelview.cpp:1233
+#: kbabel/kbabelview.cpp:1349 kbabel/kbabelview2.cpp:757
+#, c-format
+msgid ""
+"Error while trying to open file:\n"
+" %1"
+msgstr ""
+"Error while trying to open file:\n"
+" %1"
+
 #: kbabel/kbabelview.cpp:1262
 msgid ""
 "All changes will be lost if the file is reverted to its last saved state."
@@ -3232,6 +1839,15 @@ msgstr ""
 "%1\n"
 "Do you want to save to another file or cancel?"
 
+#: catalogmanager/catalogmanagerview.cpp:519 kbabel/kbabelview.cpp:1451
+msgid "The file %1 already exists. Do you want to overwrite it?"
+msgstr "The file %1 already exists. Do you want to overwrite it?"
+
+#: catalogmanager/catalogmanagerview.cpp:520 kbabel/kbabelview.cpp:1452
+#: kbabel/kbabelview.cpp:1521
+msgid "&Overwrite"
+msgstr "&Overwrite"
+
 #: kbabel/kbabelview.cpp:1482
 msgid ""
 "You have specified a folder:\n"
@@ -3273,6 +1889,11 @@ msgstr ""
 "\n"
 "Output of \"msgfmt --statistics\":\n"
 
+#: catalogmanager/catalogmanagerview.cpp:845
+#: catalogmanager/catalogmanagerview.cpp:934 kbabel/kbabelview.cpp:1649
+msgid "You can use gettext tools only for checking PO files."
+msgstr "You can use gettext tools only for checking PO files."
+
 #: kbabel/kbabelview.cpp:1658
 msgid ""
 "msgfmt detected a syntax error.\n"
@@ -3437,7 +2058,8 @@ msgid "Spellcheck"
 msgstr "Spellcheck"
 
 #: kbabel/kbabelview.cpp:3949
-msgid "KBabel cannot start spell checker. Please verify your TDE installation."
+#, fuzzy
+msgid "KBabel cannot start spell checker. Please check your TDE installation."
 msgstr ""
 "KBabel cannot start spell checker. Please verify your TDE installation."
 
@@ -3518,15 +2140,53 @@ msgstr ""
 msgid "The spell checker program seems to have crashed."
 msgstr "The spell checker program seems to have crashed."
 
-#: kbabel/spelldlg.cpp:44
+#: catalogmanager/catalogmanager.cpp:940
+#: catalogmanager/catalogmanager.cpp:1024 kbabel/kbabelview.cpp:4433
+#: kbabeldict/kbabeldictview.cpp:239
+msgid "Searching"
+msgstr "Searching"
+
+#: kbabel/charselectview.cpp:64 kbabel/kbcharselect.cpp:52
+msgid "Table:"
+msgstr "Table:"
+
+#: kbabel/charselectview.cpp:84
 msgid ""
-"_: Caption of dialog\n"
-"Spelling"
-msgstr "Spelling"
+"<qt>"
+"<p><b>Character Selector</b></p>"
+"<p>This tool allows to insert special characters using double click.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Character Selector</b></p>"
+"<p>This tool allows to insert special characters using double click.</p></qt>"
 
-#: kbabel/spelldlg.cpp:47
-msgid "&Spell Check"
-msgstr "&Spell Check"
+#: kbabel/contextview.cpp:63
+msgid ""
+"<qt>"
+"<p><b>PO Context</b></p>"
+"<p>This window shows the context of the current message in the PO file. "
+"Normally it shows four messages in front of the current message and four after "
+"it.</p>"
+"<p>You can hide the tools window by deactivating <b>Options->Show Tools</b>.</p>"
+"</qt></qt>"
+msgstr ""
+"<qt>"
+"<p><b>PO Context</b></p>"
+"<p>This window shows the context of the current message in the PO file. "
+"Normally it shows four messages in front of the current message and four after "
+"it.</p>"
+"<p>You can hide the tools window by deactivating <b>Options->Show Tools</b>.</p>"
+"</qt></qt>"
+
+#: kbabel/contextview.cpp:99
+msgid "current entry"
+msgstr "current entry"
+
+#: kbabel/contextview.cpp:140
+msgid ""
+"Plural %1: %2\n"
+msgstr ""
+"Plural %1: %2\n"
 
 #: kbabel/hidingmsgedit.cpp:76
 msgid "Context inserted by KBabel, do not translate:"
@@ -3537,6 +2197,178 @@ msgstr "Context inserted by KBabel, do not translate:"
 msgid "Plural %1"
 msgstr "Plural %1"
 
+#: kbabel/kbabelpref.cpp:57
+msgid ""
+"_: title of page in preferences dialog\n"
+"Edit"
+msgstr "Edit"
+
+#: kbabel/kbabelpref.cpp:59
+msgid "Options for Editing"
+msgstr "Options for Editing"
+
+#: kbabel/kbabelpref.cpp:70
+msgid ""
+"_: title of page in preferences dialog\n"
+"Search"
+msgstr "Search"
+
+#: kbabel/kbabelpref.cpp:72
+msgid "Options for Searching Similar Translations"
+msgstr "Options for Searching Similar Translations"
+
+#: kbabel/kbabelpref.cpp:87
+msgid "Options for Showing Differences"
+msgstr "Options for Showing Differences"
+
+#: kbabel/kbabelpref.cpp:90
+msgid ""
+"_: name of page in preferences dialog icon list\n"
+"Fonts"
+msgstr "Fonts"
+
+#: kbabel/kbabelpref.cpp:92
+msgid ""
+"_: title of page in preferences dialog\n"
+"Font Settings"
+msgstr "Font Settings"
+
+#: kbabel/kbabelpref.cpp:95
+msgid ""
+"_: name of page in preferences dialog icon list\n"
+"Colors"
+msgstr "Colours"
+
+#: kbabel/kbabelpref.cpp:97
+msgid ""
+"_: title of page in preferences dialog\n"
+"Color Settings"
+msgstr "Colour Settings"
+
+#: kbabel/kbcataloglistview.cpp:44
+msgid "Id"
+msgstr "Id"
+
+#: kbabel/kbcataloglistview.cpp:45
+msgid "Original String"
+msgstr "Original String"
+
+#: kbabel/kbabelview2.cpp:538
+#, c-format
+msgid ""
+"An error occurred while trying to get the list of messages for this file from "
+"the database:\n"
+"%1"
+msgstr ""
+"An error occurred while trying to get the list of messages for this file from "
+"the database:\n"
+"%1"
+
+#: kbabel/kbabelview2.cpp:624
+msgid "No difference found"
+msgstr "No difference found"
+
+#: kbabel/kbabelview2.cpp:628
+msgid "Difference found"
+msgstr "Difference found"
+
+#: kbabel/kbabelview2.cpp:636
+msgid "No corresponding message found."
+msgstr "No corresponding message found."
+
+#: kbabel/kbabelview2.cpp:641
+msgid "No corresponding message found"
+msgstr "No corresponding message found"
+
+#: kbabel/kbabelview2.cpp:696
+msgid "Select File to Diff With"
+msgstr "Select File to Diff With"
+
+#: kbabel/kbabelview2.cpp:710
+msgid "loading file for diff"
+msgstr "loading file for diff"
+
+#: kbabel/kbabelview2.cpp:801
+msgid ""
+"The search string has not been found yet.\n"
+"However, the string might be found in the files being searched at the moment.\n"
+"Please try later."
+msgstr ""
+"The search string has not been found yet.\n"
+"However, the string might be found in the files being searched at the moment.\n"
+"Please try later."
+
+#: kbabel/kbabelview2.cpp:810
+msgid "Do not show in this find/replace session again"
+msgstr "Do not show in this find/replace session again"
+
+#: kbabel/kbabelview2.cpp:825
+msgid "Enter new package for the current file:"
+msgstr "Enter new package for the current file:"
+
+#: kbabel/kbabelview2.cpp:1021
+msgid ""
+"Total words: %1\n"
+"\n"
+"Words in untranslated messages: %2\n"
+"\n"
+"Words in fuzzy messages: %3"
+msgstr ""
+"Total words: %1\n"
+"\n"
+"Words in untranslated messages: %2\n"
+"\n"
+"Words in fuzzy messages: %3"
+
+#: kbabel/kbabelview2.cpp:1024
+msgid "Word Count"
+msgstr "Word Count"
+
+#. i18n: file ./kbabel/headerwidget.ui line 24
+#: kbabel/commentview.cpp:78 rc.cpp:265
+#, no-c-format
+msgid "&Comment:"
+msgstr "&Comment:"
+
+#: kbabel/commentview.cpp:88
+msgid ""
+"<qt>"
+"<p><b>Comment Editor</b></p>\n"
+"This edit window shows you the comments of the currently displayed message."
+"<p>\n"
+"<p>The comments normally contain information about where the message is found "
+"in the source\n"
+"code and status information about this message (fuzzy, c-format).\n"
+"Hints from other translators are also sometimes contained in comments.</p>\n"
+"<p>You can hide the comment editor by deactivating\n"
+"<b>Options->Show Comments</b>.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Comment Editor</b></p>\n"
+"This edit window shows you the comments of the currently displayed message."
+"<p>\n"
+"<p>The comments normally contain information about where the message is found "
+"in the source\n"
+"code and status information about this message (fuzzy, c-format).\n"
+"Hints from other translators are also sometimes contained in comments.</p>\n"
+"<p>You can hide the comment editor by deactivating\n"
+"<b>Options->Show Comments</b>.</p></qt>"
+
+#: catalogmanager/catalogmanager.cpp:129 kbabel/kbabel.cpp:132
+#: kbabel/kbabel.cpp:150 kbabel/kbabel.cpp:1754
+#, c-format
+msgid ""
+"Cannot open project file\n"
+"%1"
+msgstr ""
+"Cannot open project file\n"
+"%1"
+
+#: catalogmanager/catalogmanager.cpp:130 kbabel/kbabel.cpp:133
+#: kbabel/kbabel.cpp:151 kbabel/kbabel.cpp:1755
+msgid "Project File Error"
+msgstr "Project File Error"
+
 #: kbabel/kbabel.cpp:330
 msgid ""
 "You have not run KBabel before. To allow KBabel to work correctly you must "
@@ -3635,6 +2467,38 @@ msgstr "&First Entry"
 msgid "&Last Entry"
 msgstr "&Last Entry"
 
+#: catalogmanager/catalogmanager.cpp:299 kbabel/kbabel.cpp:528
+msgid "P&revious Fuzzy or Untranslated"
+msgstr "P&revious Fuzzy or Untranslated"
+
+#: catalogmanager/catalogmanager.cpp:296 kbabel/kbabel.cpp:531
+msgid "N&ext Fuzzy or Untranslated"
+msgstr "N&ext Fuzzy or Untranslated"
+
+#: catalogmanager/catalogmanager.cpp:293 kbabel/kbabel.cpp:534
+msgid "Pre&vious Fuzzy"
+msgstr "Pre&vious Fuzzy"
+
+#: catalogmanager/catalogmanager.cpp:290 kbabel/kbabel.cpp:537
+msgid "Ne&xt Fuzzy"
+msgstr "Ne&xt Fuzzy"
+
+#: catalogmanager/catalogmanager.cpp:287 kbabel/kbabel.cpp:540
+msgid "Prev&ious Untranslated"
+msgstr "Prev&ious Untranslated"
+
+#: catalogmanager/catalogmanager.cpp:284 kbabel/kbabel.cpp:543
+msgid "Nex&t Untranslated"
+msgstr "Nex&t Untranslated"
+
+#: catalogmanager/catalogmanager.cpp:306 kbabel/kbabel.cpp:546
+msgid "Previo&us Error"
+msgstr "Previo&us Error"
+
+#: catalogmanager/catalogmanager.cpp:303 kbabel/kbabel.cpp:549
+msgid "Next Err&or"
+msgstr "Next Err&or"
+
 #: kbabel/kbabel.cpp:552
 msgid "&Back in History"
 msgstr "&Back in History"
@@ -3663,6 +2527,18 @@ msgstr "Con&figure Dictionary"
 msgid "About Dictionary"
 msgstr "About Dictionary"
 
+#: catalogmanager/catalogmanager.cpp:331 kbabel/kbabel.cpp:594
+msgid "&New..."
+msgstr "&New..."
+
+#: catalogmanager/catalogmanager.cpp:339 kbabel/kbabel.cpp:602
+msgid "C&lose"
+msgstr "C&lose"
+
+#: catalogmanager/catalogmanager.cpp:345 kbabel/kbabel.cpp:607
+msgid "&Configure..."
+msgstr "&Configure..."
+
 #: kbabel/kbabel.cpp:614
 msgid "&Spell Check..."
 msgstr "&Spell Check..."
@@ -3691,6 +2567,11 @@ msgstr "Chec&k Selected Text..."
 msgid "&Diffmode"
 msgstr "&Diffmode"
 
+#: catalogmanager/libcvs/cvsdialog.cpp:358
+#: catalogmanager/libsvn/svndialog.cpp:337 kbabel/kbabel.cpp:642
+msgid "&Show Diff"
+msgstr "&Show Diff"
+
 #: kbabel/kbabel.cpp:645
 msgid "S&how Original Text"
 msgstr "S&how Original Text"
@@ -3715,6 +2596,10 @@ msgstr "Toggle Edit Mode"
 msgid "&Word Count"
 msgstr "&Word Count"
 
+#: catalogmanager/catalogmanager.cpp:243 kbabel/kbabel.cpp:674
+msgid "&Stop Searching"
+msgstr "&Stop Searching"
+
 #: kbabel/kbabel.cpp:678
 msgid "&Gettext Info"
 msgstr "&Gettext Info"
@@ -3744,7 +2629,7 @@ msgid "Untranslated: 0"
 msgstr "Untranslated: 0"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 75
-#: kbabel/kbabel.cpp:713 rc.cpp:803
+#: kbabel/kbabel.cpp:713 rc.cpp:924
 #, no-c-format
 msgid "Status: "
 msgstr "Status: "
@@ -3777,6 +2662,10 @@ msgstr ""
 "messages. Also the index and the status of the currently displayed entry is "
 "shown.</p></qt>"
 
+#: catalogmanager/catalogmanager.cpp:399 kbabel/kbabel.cpp:765
+msgid "&Validation"
+msgstr "&Validation"
+
 #: kbabel/kbabel.cpp:767
 msgid "Perform &All Checks"
 msgstr "Perform &All Checks"
@@ -3848,235 +2737,198 @@ msgid ""
 "Spellcheck Done"
 msgstr "Spellcheck Done"
 
-#: kbabel/kbabelview2.cpp:538
-#, c-format
+#: kbabel/errorlistview.cpp:62
 msgid ""
-"An error occurred while trying to get the list of messages for this file from "
-"the database:\n"
-"%1"
+"<qt>"
+"<p><b>Error List</b></p>"
+"<p>This window shows the list of errors found by validator tools so you can "
+"know why the current message has been marked with an error.</p></qt>"
 msgstr ""
-"An error occurred while trying to get the list of messages for this file from "
-"the database:\n"
-"%1"
-
-#: kbabel/kbabelview2.cpp:624
-msgid "No difference found"
-msgstr "No difference found"
-
-#: kbabel/kbabelview2.cpp:628
-msgid "Difference found"
-msgstr "Difference found"
-
-#: kbabel/kbabelview2.cpp:636
-msgid "No corresponding message found."
-msgstr "No corresponding message found."
-
-#: kbabel/kbabelview2.cpp:641
-msgid "No corresponding message found"
-msgstr "No corresponding message found"
+"<qt>"
+"<p><b>Error List</b></p>"
+"<p>This window shows the list of errors found by validator tools so you can "
+"know why the current message has been marked with an error.</p></qt>"
 
-#: kbabel/kbabelview2.cpp:696
-msgid "Select File to Diff With"
-msgstr "Select File to Diff With"
+#: kbabel/gotodialog.cpp:41 kbabel/gotodialog.cpp:43
+msgid "Go to Entry"
+msgstr "Go to Entry"
 
-#: kbabel/kbabelview2.cpp:710
-msgid "loading file for diff"
-msgstr "loading file for diff"
+#: kbabel/headereditor.cpp:60
+msgid "&Apply Settings"
+msgstr "&Apply Settings"
 
-#: kbabel/kbabelview2.cpp:801
+#: kbabel/headereditor.cpp:61
 msgid ""
-"The search string has not been found yet.\n"
-"However, the string might be found in the files being searched at the moment.\n"
-"Please try later."
+"<qt>"
+"<p>This button updates the header using the current settings. The resulting "
+"header is the one that would be written into the PO file on saving.</p></qt>"
 msgstr ""
-"The search string has not been found yet.\n"
-"However, the string might be found in the files being searched at the moment.\n"
-"Please try later."
+"<qt>"
+"<p>This button updates the header using the current settings. The resulting "
+"header is the one that would be written into the PO file on saving.</p></qt>"
 
-#: kbabel/kbabelview2.cpp:810
-msgid "Do not show in this find/replace session again"
-msgstr "Do not show in this find/replace session again"
+#: kbabel/headereditor.cpp:65
+msgid "&Reset"
+msgstr "&Reset"
 
-#: kbabel/kbabelview2.cpp:825
-msgid "Enter new package for the current file:"
-msgstr "Enter new package for the current file:"
+#: kbabel/headereditor.cpp:66
+msgid "<qt><p>This button will revert all changes made so far.</p></qt>"
+msgstr "<qt><p>This button will revert all changes made so far.</p></qt>"
 
-#: kbabel/kbabelview2.cpp:1021
+#: kbabel/headereditor.cpp:111
+#, c-format
+msgid "Header Editor for %1"
+msgstr "Header Editor for %1"
+
+#: kbabel/headereditor.cpp:136
 msgid ""
-"Total words: %1\n"
-"\n"
-"Words in untranslated messages: %2\n"
-"\n"
-"Words in fuzzy messages: %3"
+"<qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating!</p></qt>"
 msgstr ""
-"Total words: %1\n"
-"\n"
-"Words in untranslated messages: %2\n"
-"\n"
-"Words in fuzzy messages: %3"
-
-#: kbabel/kbabelview2.cpp:1024
-msgid "Word Count"
-msgstr "Word Count"
-
-#: kbabel/charselectview.cpp:64 kbabel/kbcharselect.cpp:52
-msgid "Table:"
-msgstr "Table:"
+"<qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating!</p></qt>"
 
-#: kbabel/charselectview.cpp:84
+#: kbabel/headereditor.cpp:172
 msgid ""
 "<qt>"
-"<p><b>Character Selector</b></p>"
-"<p>This tool allows to insert special characters using double click.</p></qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating.</p></qt>"
 msgstr ""
 "<qt>"
-"<p><b>Character Selector</b></p>"
-"<p>This tool allows to insert special characters using double click.</p></qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating.</p></qt>"
 
-#: kbabel/gotodialog.cpp:41 kbabel/gotodialog.cpp:43
-msgid "Go to Entry"
-msgstr "Go to Entry"
+#: kbabel/spelldlg.cpp:44
+msgid ""
+"_: Caption of dialog\n"
+"Spelling"
+msgstr "Spelling"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 11
-#: rc.cpp:6 rc.cpp:331
-#, no-c-format
-msgid "&Go"
-msgstr "&Go"
+#: kbabel/spelldlg.cpp:47
+msgid "&Spell Check"
+msgstr "&Spell Check"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 30
-#: rc.cpp:9
-#, no-c-format
-msgid "&Markings"
-msgstr "&Markings"
+#: kbabel/main.cpp:537
+msgid "Go to entry with msgid <msgid>"
+msgstr "Go to entry with msgid <msgid>"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 43
-#: rc.cpp:12 rc.cpp:334
-#, no-c-format
-msgid "&Project"
-msgstr "&Project"
+#: kbabel/main.cpp:538 kbabeldict/main.cpp:105
+msgid "Disable splashscreen at startup"
+msgstr "Disable splashscreen at startup"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 60
-#: rc.cpp:18 rc.cpp:36 rc.cpp:42
-#, no-c-format
-msgid "CVS"
-msgstr "CVS"
+#: catalogmanager/main.cpp:178 kbabel/main.cpp:539
+msgid "File to load configuration from"
+msgstr "File to load configuration from"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 122
-#: rc.cpp:30 rc.cpp:358
-#, no-c-format
-msgid "Main"
-msgstr "Main"
+#: kbabel/main.cpp:540
+msgid "Files to open"
+msgstr "Files to open"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 128
-#: rc.cpp:33 rc.cpp:361
-#, no-c-format
-msgid "Navigationbar"
-msgstr "Navigation bar"
+#: kbabel/main.cpp:547
+msgid "KBabel"
+msgstr "KBabel"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 38
-#: kbabeldict/kbabeldictbox.cpp:208 rc.cpp:48
-#, no-c-format
-msgid "Current:"
-msgstr "Current:"
+#: kbabel/main.cpp:548
+msgid "An advanced PO file editor"
+msgstr "An advanced PO file editor"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 59
-#: rc.cpp:51
-#, no-c-format
-msgid "Overall:"
-msgstr "Overall:"
+#: catalogmanager/main.cpp:188 kbabel/main.cpp:549
+msgid "(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"
+msgstr "(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 80
-#: rc.cpp:54
-#, no-c-format
-msgid "Current file:"
-msgstr "Current file:"
+#: catalogmanager/main.cpp:190 kbabel/main.cpp:551 kbabeldict/main.cpp:118
+msgid "Original author"
+msgstr "Original author"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 88
-#: rc.cpp:57
-#, no-c-format
-msgid "Validation:"
-msgstr "Validation:"
+#: catalogmanager/main.cpp:202 kbabel/main.cpp:553
+msgid "Wrote diff algorithm, fixed KSpell and gave a lot of useful hints."
+msgstr "Wrote diff algorithm, fixed KSpell and gave a lot of useful hints."
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 96
-#: rc.cpp:60 rc.cpp:143 rc.cpp:740
-#, no-c-format
-msgid "New Item"
-msgstr "New Item"
+#: kbabel/main.cpp:555
+msgid ""
+"Wrote the dictionary plugin for searching in a database and some other code."
+msgstr ""
+"Wrote the dictionary plugin for searching in a database and some other code."
 
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 24
-#: rc.cpp:63
-#, no-c-format
-msgid "To be set dynamically:"
-msgstr "To be set dynamically:"
+#: catalogmanager/main.cpp:191 kbabel/main.cpp:558
+#, fuzzy
+msgid "Current maintainer, porting to KDE3/Qt3."
+msgstr "Current maintainer, porting to TDE3/Qt3."
 
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 62
-#: rc.cpp:72
-#, no-c-format
-msgid "&Include templates"
-msgstr "&Include templates"
+#: kbabel/main.cpp:560
+msgid "Bug fixes, KFilePlugin for PO files, CVS support, mailing files"
+msgstr "Bug fixes, KFilePlugin for PO files, CVS support, mailing files"
 
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 70
-#: rc.cpp:75
-#, no-c-format
-msgid "Use &wildcards"
-msgstr "Use &wildcards"
+#: kbabel/main.cpp:562
+msgid "Translation List View"
+msgstr "Translation List View"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 32
-#: rc.cpp:84
-#, no-c-format
-msgid "Mark invalid as &fuzzy"
-msgstr "Mark invalid as &fuzzy"
+#: catalogmanager/main.cpp:193 kbabel/main.cpp:564 kbabeldict/main.cpp:119
+msgid "Current maintainer"
+msgstr "Current maintainer"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 39
-#: rc.cpp:87
-#, no-c-format
+#: catalogmanager/main.cpp:195 kbabel/main.cpp:566
 msgid ""
-"<qt>"
-"<p><b>Mark invalid as fuzzy</b>"
-"<p>\n"
-"<p>If you select this option, all items,\n"
-"which identifies the tool as invalid, will be\n"
-"marked as fuzzy and the resulting file\n"
-"will be saved.</p></qt>"
+"Wrote documentation and sent many bug reports and suggestions for improvements."
 msgstr ""
-"<qt>"
-"<p><b>Mark invalid as fuzzy</b>"
-"<p>\n"
-"<p>If you select this option, all items,\n"
-"which identifies the tool as invalid, will be\n"
-"marked as fuzzy and the resulting file\n"
-"will be saved.</p></qt>"
+"Wrote documentation and sent many bug reports and suggestions for improvements."
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 47
-#: rc.cpp:94
-#, no-c-format
-msgid "&Do not validate fuzzy"
-msgstr "&Do not validate fuzzy"
+#: catalogmanager/main.cpp:198 kbabel/main.cpp:569
+msgid ""
+"Gave many suggestions for the GUI and the behavior of KBabel. He also "
+"contributed the beautiful splash screen."
+msgstr ""
+"Gave many suggestions for the GUI and the behaviour of KBabel. He also "
+"contributed the beautiful splash screen."
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 52
-#: rc.cpp:97
-#, no-c-format
+#: catalogmanager/main.cpp:204 kbabel/main.cpp:572
+#, fuzzy
 msgid ""
-"<qt>"
-"<p><b>Do not validate fuzzy</b>"
-"<p>\n"
-"<p>If you select this option, all items\n"
-"marked as fuzzy will not be validated at all.</p></qt>"
+"Helped keep KBabel up to date with the KDE API and gave a lot of other help."
 msgstr ""
-"<qt>"
-"<p><b>Do not validate fuzzy</b>"
-"<p>\n"
-"<p>If you select this option, all items\n"
-"marked as fuzzy will not be validated at all.</p></qt>"
+"Helped keep KBabel up to date with the TDE API and gave a lot of other help."
+
+#: kbabel/main.cpp:574
+msgid "Implemented XML validation/highlighting plus other small fixes."
+msgstr "Implemented XML validation/highlighting plus other small fixes."
+
+#: catalogmanager/main.cpp:206 kbabel/main.cpp:576
+msgid "Various validation plugins."
+msgstr "Various validation plugins."
+
+#: catalogmanager/main.cpp:209 kbabel/main.cpp:579
+msgid "Sponsored development of KBabel for a while."
+msgstr "Sponsored development of KBabel for a while."
+
+#: catalogmanager/main.cpp:214 kbabel/main.cpp:581
+#, fuzzy
+msgid "KBabel contains code from TQt"
+msgstr "KBabel contains code from Qt"
+
+#: kbabel/main.cpp:583
+#, fuzzy
+msgid "String distance algorithm implementation"
+msgstr "String difference algorithm implementation"
+
+#: kbabel/main.cpp:585
+msgid "Error list for current entry, regexp data tool"
+msgstr "Error list for current entry, regexp data tool"
+
+#: kbabel/main.cpp:587
+#, fuzzy
+msgid "Word-by-word string difference algorithm implementation"
+msgstr "String difference algorithm implementation"
 
 #. i18n: file ./commonui/diffpreferences.ui line 25
-#: rc.cpp:102
+#: rc.cpp:3
 #, no-c-format
 msgid "Diff Source"
 msgstr "Diff Source"
 
 #. i18n: file ./commonui/diffpreferences.ui line 41
-#: rc.cpp:105
+#: rc.cpp:6
 #, no-c-format
 msgid ""
 "<qt>"
@@ -4112,31 +2964,31 @@ msgstr ""
 "in KBabel's main window.</p></qt>"
 
 #. i18n: file ./commonui/diffpreferences.ui line 52
-#: rc.cpp:121
+#: rc.cpp:22
 #, no-c-format
 msgid "Use &file"
 msgstr "Use &file"
 
 #. i18n: file ./commonui/diffpreferences.ui line 60
-#: rc.cpp:124
+#: rc.cpp:25
 #, no-c-format
 msgid "Use messages from &translation database"
 msgstr "Use messages from &translation database"
 
 #. i18n: file ./commonui/diffpreferences.ui line 68
-#: rc.cpp:127
+#: rc.cpp:28
 #, no-c-format
 msgid "Use &msgstr from the same file"
 msgstr "Use &msgstr from the same file"
 
 #. i18n: file ./commonui/diffpreferences.ui line 86
-#: rc.cpp:130
+#: rc.cpp:31
 #, no-c-format
 msgid "Base folder for diff files:"
 msgstr "Base folder for diff files:"
 
 #. i18n: file ./commonui/diffpreferences.ui line 104
-#: rc.cpp:133
+#: rc.cpp:34
 #, no-c-format
 msgid ""
 "<qt><q><b>Base folder for diff files</b></q>\n"
@@ -4157,20 +3009,8 @@ msgstr ""
 "<p>Note that this option has no effect if messages from\n"
 "the database are used for diffing.</p></qt>"
 
-#. i18n: file ./commonui/tdelisteditor.ui line 151
-#: rc.cpp:152
-#, no-c-format
-msgid "Up"
-msgstr "Up"
-
-#. i18n: file ./commonui/tdelisteditor.ui line 162
-#: rc.cpp:155
-#, no-c-format
-msgid "Down"
-msgstr "Down"
-
 #. i18n: file ./commonui/projectwizardwidget.ui line 38
-#: rc.cpp:158
+#: rc.cpp:44
 #, no-c-format
 msgid ""
 "<font size=\"+1\">Welcome to Project Wizard!</font>\n"
@@ -4204,7 +3044,7 @@ msgstr ""
 "</p>"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 66
-#: rc.cpp:174 rc.cpp:251
+#: rc.cpp:60 rc.cpp:137
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -4222,13 +3062,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 74
-#: rc.cpp:181
+#: rc.cpp:67
 #, no-c-format
 msgid "&Language:"
 msgstr "&Language:"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 86
-#: rc.cpp:184 rc.cpp:206
+#: rc.cpp:70 rc.cpp:92
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -4250,13 +3090,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 97
-#: rc.cpp:193
+#: rc.cpp:79
 #, no-c-format
 msgid "Project &name:"
 msgstr "Project &name:"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 110
-#: rc.cpp:196 rc.cpp:238
+#: rc.cpp:82 rc.cpp:124
 #, no-c-format
 msgid ""
 "<qt>"
@@ -4282,14 +3122,14 @@ msgstr ""
 "</p></qt>"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 135
-#: rc.cpp:215
+#: rc.cpp:101
 #, no-c-format
 msgid "Project &type:"
 msgstr "Project &type:"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 158
-#: rc.cpp:218 rc.cpp:270
-#, no-c-format
+#: rc.cpp:104 rc.cpp:156
+#, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
 "<p>\n"
@@ -4301,7 +3141,7 @@ msgid ""
 "</p>\n"
 "<p>Currently known types:\n"
 "<ul>\n"
-"<li><b>TDE</b>: K Desktop Environment Internalization project</li>\n"
+"<li><b>TDE</b>: Trinity Desktop Environment Internalization project</li>\n"
 "<li><b>GNOME</b>: GNOME Translation project</li>\n"
 "<li><b>Translation Robot</b>: Translation Project Robot</li>\n"
 "<li><b>Other</b>: Other kind of project. No tuning will be\n"
@@ -4330,37 +3170,37 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 184
-#: rc.cpp:248
+#: rc.cpp:134
 #, no-c-format
 msgid "Configuration &file name:"
 msgstr "Configuration &file name:"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 200
-#: rc.cpp:258
+#: rc.cpp:144
 #, no-c-format
 msgid "TDE"
 msgstr "TDE"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 205
-#: rc.cpp:261
+#: rc.cpp:147
 #, no-c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 210
-#: rc.cpp:264
+#: rc.cpp:150
 #, no-c-format
 msgid "Translation Project Robot"
 msgstr "Translation Project Robot"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 215
-#: rc.cpp:267
+#: rc.cpp:153
 #, no-c-format
 msgid "Other"
 msgstr "Other"
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 18
-#: rc.cpp:290
+#: rc.cpp:176
 #, no-c-format
 msgid ""
 "<qt>"
@@ -4376,7 +3216,7 @@ msgstr ""
 "tree.</p></qt>"
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 44
-#: rc.cpp:295
+#: rc.cpp:181
 #, no-c-format
 msgid ""
 "<font size=\"+1\">The Translation Files</font>\n"
@@ -4415,164 +3255,128 @@ msgstr ""
 "leave the entries empty, the Catalogue Manager\n"
 "will not work."
 
-#. i18n: file ./kbabel/fontpreferences.ui line 25
-#: rc.cpp:319
+#. i18n: file ./commonui/tdelisteditor.ui line 94
+#: rc.cpp:205 rc.cpp:861 rc.cpp:1246
 #, no-c-format
-msgid "Font for Messages"
-msgstr "Font for Messages"
+msgid "New Item"
+msgstr "New Item"
 
-#. i18n: file ./kbabel/fontpreferences.ui line 36
-#: rc.cpp:322
+#. i18n: file ./commonui/tdelisteditor.ui line 151
+#: rc.cpp:214
 #, no-c-format
-msgid "&Show only fixed font"
-msgstr "&Show only fixed font"
+msgid "Up"
+msgstr "Up"
 
-#. i18n: file ./kbabel/kbabelui.rc line 58
-#: rc.cpp:340
+#. i18n: file ./commonui/tdelisteditor.ui line 162
+#: rc.cpp:217
 #, no-c-format
-msgid "&Spelling"
-msgstr "&Spelling"
+msgid "Down"
+msgstr "Down"
 
-#. i18n: file ./kbabel/kbabelui.rc line 68
-#: rc.cpp:343
+#. i18n: file ./kbabel/spelldlgwidget.ui line 24
+#: rc.cpp:220
 #, no-c-format
-msgid "D&iff"
-msgstr "D&iff"
+msgid "Choose What You Want to Spell Check"
+msgstr "Choose What You Want to Spell Check"
 
-#. i18n: file ./kbabel/kbabelui.rc line 82
-#: rc.cpp:346
+#. i18n: file ./kbabel/spelldlgwidget.ui line 30
+#: rc.cpp:223 rc.cpp:235
 #, no-c-format
-msgid "&Dictionaries"
-msgstr "&Dictionaries"
+msgid "Spell check only the current message."
+msgstr "Spell check only the current message."
 
-#. i18n: file ./kbabel/colorpreferences.ui line 41
-#: rc.cpp:364
+#. i18n: file ./kbabel/spelldlgwidget.ui line 41
+#: rc.cpp:226
 #, no-c-format
-msgid "&Background color:"
-msgstr "&Background colour:"
+msgid "A&ll messages"
+msgstr "A&ll messages"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 52
-#: rc.cpp:367
+#. i18n: file ./kbabel/spelldlgwidget.ui line 44
+#: rc.cpp:229
 #, no-c-format
-msgid "Color for &quoted characters:"
-msgstr "Colour for &quoted characters:"
+msgid "Spell check all translated messages of this file."
+msgstr "Spell check all translated messages of this file."
 
-#. i18n: file ./kbabel/colorpreferences.ui line 63
-#: rc.cpp:370
+#. i18n: file ./kbabel/spelldlgwidget.ui line 52
+#: rc.cpp:232
 #, no-c-format
-msgid "Color for &syntax errors:"
-msgstr "Colour for &syntax errors:"
+msgid "C&urrent message only"
+msgstr "C&urrent message only"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 82
-#: rc.cpp:373
+#. i18n: file ./kbabel/spelldlgwidget.ui line 66
+#: rc.cpp:238
 #, no-c-format
-msgid "Color for s&pellcheck errors:"
-msgstr "Colour for s&pellcheck errors:"
+msgid "Fro&m beginning of current message to end of file"
+msgstr "Fro&m beginning of current message to end of file"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 97
-#: rc.cpp:376
+#. i18n: file ./kbabel/spelldlgwidget.ui line 74
+#: rc.cpp:241
 #, no-c-format
-msgid ""
-"<qt>Here you can setup a color to display identified <b>mispelled</b> "
-"words and\n"
-"phrases.</qt>"
-msgstr ""
-"<qt>Here you can setup a colour to display identified <b>mispelled</b> "
-"words and\n"
-"phrases.</qt>"
+msgid "&From beginning of file to cursor position"
+msgstr "&From beginning of file to cursor position"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 105
-#: rc.cpp:380
+#. i18n: file ./kbabel/spelldlgwidget.ui line 77
+#: rc.cpp:244
 #, no-c-format
-msgid "Color for &keyboard accelerators:"
-msgstr "Colour for &keyboard accelerators:"
+msgid ""
+"Spell check all text from the beginning of the file to the current cursor "
+"position."
+msgstr ""
+"Spell check all text from the beginning of the file to the current cursor "
+"position."
 
-#. i18n: file ./kbabel/colorpreferences.ui line 132
-#: rc.cpp:383
+#. i18n: file ./kbabel/spelldlgwidget.ui line 85
+#: rc.cpp:247
 #, no-c-format
-msgid "Color for c-for&mat characters:"
-msgstr "Colour for c-for&mat characters:"
+msgid "F&rom cursor position to end of file"
+msgstr "F&rom cursor position to end of file"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 151
-#: rc.cpp:386
+#. i18n: file ./kbabel/spelldlgwidget.ui line 88
+#: rc.cpp:250
 #, no-c-format
-msgid "Color for &tags:"
-msgstr "Colour for &tags:"
+msgid ""
+"Spell check all text from the current cursor position to the end of the file."
+msgstr ""
+"Spell check all text from the current cursor position to the end of the file."
 
-#. i18n: file ./kbabel/searchpreferences.ui line 39
-#: rc.cpp:389
+#. i18n: file ./kbabel/spelldlgwidget.ui line 96
+#: rc.cpp:253
 #, no-c-format
-msgid "Au&tomatically start search"
-msgstr "Au&tomatically start search"
+msgid "S&elected text only"
+msgstr "S&elected text only"
 
-#. i18n: file ./kbabel/searchpreferences.ui line 49
-#: rc.cpp:392
+#. i18n: file ./kbabel/spelldlgwidget.ui line 99
+#: rc.cpp:256
 #, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Automatically start search</b></p>\n"
-"<p>If this is activated, the search is automatically started \n"
-"whenever you switch to another entry in the editor. You can \n"
-"choose where to search with the combo box <b>Default Dictionary</b>.\n"
-"</p>"
-"<p>You can also start searching manually by choosing an entry in \n"
-"the popup menu that appears either when clicking \n"
-"<b>Dictionaries->Find...</b> or keeping the dictionary button \n"
-"in the toolbar pressed for a while.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Automatically start search</b></p>\n"
-"<p>If this is activated, the search is automatically started \n"
-"whenever you switch to another entry in the editor. You can \n"
-"choose where to search with the combo box <b>Default Dictionary</b>.\n"
-"</p>"
-"<p>You can also start searching manually by choosing an entry in \n"
-"the popup menu that appears either when clicking \n"
-"<b>Dictionaries->Find...</b> or keeping the dictionary button \n"
-"in the toolbar pressed for a while.</p></qt>"
+msgid "Spell check only the selected text."
+msgstr "Spell check only the selected text."
 
-#. i18n: file ./kbabel/searchpreferences.ui line 65
-#: rc.cpp:402
+#. i18n: file ./kbabel/spelldlgwidget.ui line 109
+#: rc.cpp:259
 #, no-c-format
-msgid "D&efault dictionary:"
-msgstr "D&efault dictionary:"
+msgid "U&se this selection as default"
+msgstr "U&se this selection as default"
 
-#. i18n: file ./kbabel/searchpreferences.ui line 82
-#: rc.cpp:405
+#. i18n: file ./kbabel/spelldlgwidget.ui line 112
+#: rc.cpp:262
 #, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Default Dictionary</b></p>\n"
-"<p>Choose here where to search as default. \n"
-"This setting is used when searching is started automatically \n"
-"or when pressing the dictionary button in the toolbar.</p>\n"
-"<p>You can configure the different dictionaries by selecting \n"
-"the desired dictionary from <b>Settings->Configure Dictionary</b>.\n"
-"</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Default Dictionary</b></p>\n"
-"<p>Choose here where to search as default. \n"
-"This setting is used when searching is started automatically \n"
-"or when pressing the dictionary button in the toolbar.</p>\n"
-"<p>You can configure the different dictionaries by selecting \n"
-"the desired dictionary from <b>Settings->Configure Dictionary</b>.\n"
-"</p></qt>"
+msgid "Check this, to store the current selection as default selection."
+msgstr "Tick this, to store the current selection as default selection."
 
 #. i18n: file ./kbabel/headerwidget.ui line 43
-#: rc.cpp:417
+#: rc.cpp:268
 #, no-c-format
 msgid "&Header:"
 msgstr "&Header:"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 54
-#: rc.cpp:423
+#: rc.cpp:274
 #, no-c-format
 msgid "A&utomatically unset fuzzy status"
 msgstr "A&utomatically unset fuzzy status"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 60
-#: rc.cpp:426
+#: rc.cpp:277
 #, no-c-format
 msgid ""
 "<qt>"
@@ -4590,13 +3394,13 @@ msgstr ""
 "is removed from the entry's comment).</p></qt>"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 68
-#: rc.cpp:432
+#: rc.cpp:283
 #, no-c-format
 msgid "Use cle&ver editing"
 msgstr "Use cle&ver editing"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 79
-#: rc.cpp:435
+#: rc.cpp:286
 #, no-c-format
 msgid ""
 "<qt>"
@@ -4622,13 +3426,13 @@ msgstr ""
 "generate syntactically incorrect text.</p></qt>"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 89
-#: rc.cpp:446
+#: rc.cpp:297
 #, no-c-format
 msgid "Automatic Checks"
 msgstr "Automatic Checks"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 97
-#: rc.cpp:449
+#: rc.cpp:300
 #, no-c-format
 msgid ""
 "<qt>"
@@ -4648,55 +3452,55 @@ msgstr ""
 "</p></qt>"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 113
-#: rc.cpp:457
+#: rc.cpp:308
 #, no-c-format
 msgid "&Beep on error"
 msgstr "&Beep on error"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 121
-#: rc.cpp:460
+#: rc.cpp:311
 #, no-c-format
 msgid "Change te&xt color on error"
 msgstr "Change te&xt colour on error"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 150
-#: rc.cpp:463
+#: rc.cpp:314
 #, no-c-format
 msgid "A&ppearance"
 msgstr "A&ppearance"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 175
-#: rc.cpp:466
+#: rc.cpp:317
 #, no-c-format
 msgid "H&ighlight syntax"
 msgstr "H&ighlight syntax"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 183
-#: rc.cpp:469
+#: rc.cpp:320
 #, no-c-format
 msgid "Highlight backgrou&nd"
 msgstr "Highlight backgrou&nd"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 191
-#: rc.cpp:472
+#: rc.cpp:323
 #, no-c-format
 msgid "Mark &whitespaces with points"
 msgstr "Mark &white spaces with points"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 199
-#: rc.cpp:475
+#: rc.cpp:326
 #, no-c-format
 msgid "&Show surrounding quotes"
 msgstr "&Show surrounding quotes"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 209
-#: rc.cpp:478
+#: rc.cpp:329
 #, no-c-format
 msgid "Status LEDs"
 msgstr "Status LEDs"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 213
-#: rc.cpp:481
+#: rc.cpp:332
 #, no-c-format
 msgid ""
 "<qt>"
@@ -4710,554 +3514,357 @@ msgstr ""
 "have.</p></qt>"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 224
-#: rc.cpp:485
+#: rc.cpp:336
 #, no-c-format
 msgid "Display in stat&usbar"
 msgstr "Display in stat&us bar"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 232
-#: rc.cpp:488
+#: rc.cpp:339
 #, no-c-format
 msgid "Display in edi&tor"
 msgstr "Display in edi&tor"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 260
-#: rc.cpp:491 rc.cpp:512
+#: rc.cpp:342 rc.cpp:363
 #, no-c-format
 msgid "Colo&r:"
 msgstr "Colou&r:"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 36
-#: rc.cpp:497
+#: rc.cpp:348
 #, no-c-format
 msgid "Added Characters"
 msgstr "Added Characters"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 44
-#: rc.cpp:500
+#: rc.cpp:351
 #, no-c-format
 msgid "Ho&w to display:"
 msgstr "Ho&w to display:"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 55
-#: rc.cpp:503
+#: rc.cpp:354
 #, no-c-format
 msgid "Co&lor:"
 msgstr "Co&lour:"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 66
-#: rc.cpp:506
+#: rc.cpp:357
 #, no-c-format
 msgid "Removed Characters"
 msgstr "Removed Characters"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 74
-#: rc.cpp:509
+#: rc.cpp:360
 #, no-c-format
 msgid "How &to display:"
 msgstr "How &to display:"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 94
-#: rc.cpp:515 rc.cpp:521
+#: rc.cpp:366 rc.cpp:372
 #, no-c-format
 msgid "Highlighted"
 msgstr "Highlighted"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 99
-#: rc.cpp:518
+#: rc.cpp:369
 #, no-c-format
 msgid "Underlined"
 msgstr "Underlined"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 129
-#: rc.cpp:524
+#: rc.cpp:375
 #, no-c-format
 msgid "Stroked Out"
 msgstr "Stroked Out"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 24
-#: rc.cpp:527
+#. i18n: file ./kbabel/colorpreferences.ui line 41
+#: rc.cpp:378
 #, no-c-format
-msgid "Choose What You Want to Spell Check"
-msgstr "Choose What You Want to Spell Check"
+msgid "&Background color:"
+msgstr "&Background colour:"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 30
-#: rc.cpp:530 rc.cpp:542
+#. i18n: file ./kbabel/colorpreferences.ui line 52
+#: rc.cpp:381
 #, no-c-format
-msgid "Spell check only the current message."
-msgstr "Spell check only the current message."
+msgid "Color for &quoted characters:"
+msgstr "Colour for &quoted characters:"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 41
-#: rc.cpp:533
+#. i18n: file ./kbabel/colorpreferences.ui line 63
+#: rc.cpp:384
 #, no-c-format
-msgid "A&ll messages"
-msgstr "A&ll messages"
+msgid "Color for &syntax errors:"
+msgstr "Colour for &syntax errors:"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 44
-#: rc.cpp:536
+#. i18n: file ./kbabel/colorpreferences.ui line 82
+#: rc.cpp:387
 #, no-c-format
-msgid "Spell check all translated messages of this file."
-msgstr "Spell check all translated messages of this file."
+msgid "Color for s&pellcheck errors:"
+msgstr "Colour for s&pellcheck errors:"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 52
-#: rc.cpp:539
+#. i18n: file ./kbabel/colorpreferences.ui line 97
+#: rc.cpp:390
 #, no-c-format
-msgid "C&urrent message only"
-msgstr "C&urrent message only"
+msgid ""
+"<qt>Here you can setup a color to display identified <b>mispelled</b> "
+"words and\n"
+"phrases.</qt>"
+msgstr ""
+"<qt>Here you can setup a colour to display identified <b>mispelled</b> "
+"words and\n"
+"phrases.</qt>"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 66
-#: rc.cpp:545
+#. i18n: file ./kbabel/colorpreferences.ui line 105
+#: rc.cpp:394
 #, no-c-format
-msgid "Fro&m beginning of current message to end of file"
-msgstr "Fro&m beginning of current message to end of file"
+msgid "Color for &keyboard accelerators:"
+msgstr "Colour for &keyboard accelerators:"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 74
-#: rc.cpp:548
+#. i18n: file ./kbabel/colorpreferences.ui line 132
+#: rc.cpp:397
 #, no-c-format
-msgid "&From beginning of file to cursor position"
-msgstr "&From beginning of file to cursor position"
+msgid "Color for c-for&mat characters:"
+msgstr "Colour for c-for&mat characters:"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 77
-#: rc.cpp:551
+#. i18n: file ./kbabel/colorpreferences.ui line 151
+#: rc.cpp:400
 #, no-c-format
-msgid ""
-"Spell check all text from the beginning of the file to the current cursor "
-"position."
-msgstr ""
-"Spell check all text from the beginning of the file to the current cursor "
-"position."
+msgid "Color for &tags:"
+msgstr "Colour for &tags:"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 85
-#: rc.cpp:554
+#. i18n: file ./kbabel/kbabelui.rc line 29
+#: rc.cpp:409 rc.cpp:1171
 #, no-c-format
-msgid "F&rom cursor position to end of file"
-msgstr "F&rom cursor position to end of file"
+msgid "&Go"
+msgstr "&Go"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 88
-#: rc.cpp:557
+#. i18n: file ./kbabel/kbabelui.rc line 50
+#: rc.cpp:412 rc.cpp:1177
+#, no-c-format
+msgid "&Project"
+msgstr "&Project"
+
+#. i18n: file ./kbabel/kbabelui.rc line 58
+#: rc.cpp:418
+#, no-c-format
+msgid "&Spelling"
+msgstr "&Spelling"
+
+#. i18n: file ./kbabel/kbabelui.rc line 68
+#: rc.cpp:421
+#, no-c-format
+msgid "D&iff"
+msgstr "D&iff"
+
+#. i18n: file ./kbabel/kbabelui.rc line 82
+#: rc.cpp:424
+#, no-c-format
+msgid "&Dictionaries"
+msgstr "&Dictionaries"
+
+#. i18n: file ./kbabel/kbabelui.rc line 100
+#: rc.cpp:436 rc.cpp:1195
+#, no-c-format
+msgid "Main"
+msgstr "Main"
+
+#. i18n: file ./kbabel/kbabelui.rc line 113
+#: rc.cpp:439 rc.cpp:1198
+#, no-c-format
+msgid "Navigationbar"
+msgstr "Navigation bar"
+
+#. i18n: file ./kbabel/searchpreferences.ui line 39
+#: rc.cpp:442
+#, no-c-format
+msgid "Au&tomatically start search"
+msgstr "Au&tomatically start search"
+
+#. i18n: file ./kbabel/searchpreferences.ui line 49
+#: rc.cpp:445
 #, no-c-format
 msgid ""
-"Spell check all text from the current cursor position to the end of the file."
+"<qt>"
+"<p><b>Automatically start search</b></p>\n"
+"<p>If this is activated, the search is automatically started \n"
+"whenever you switch to another entry in the editor. You can \n"
+"choose where to search with the combo box <b>Default Dictionary</b>.\n"
+"</p>"
+"<p>You can also start searching manually by choosing an entry in \n"
+"the popup menu that appears either when clicking \n"
+"<b>Dictionaries->Find...</b> or keeping the dictionary button \n"
+"in the toolbar pressed for a while.</p></qt>"
 msgstr ""
-"Spell check all text from the current cursor position to the end of the file."
+"<qt>"
+"<p><b>Automatically start search</b></p>\n"
+"<p>If this is activated, the search is automatically started \n"
+"whenever you switch to another entry in the editor. You can \n"
+"choose where to search with the combo box <b>Default Dictionary</b>.\n"
+"</p>"
+"<p>You can also start searching manually by choosing an entry in \n"
+"the popup menu that appears either when clicking \n"
+"<b>Dictionaries->Find...</b> or keeping the dictionary button \n"
+"in the toolbar pressed for a while.</p></qt>"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 96
-#: rc.cpp:560
+#. i18n: file ./kbabel/searchpreferences.ui line 65
+#: rc.cpp:455
 #, no-c-format
-msgid "S&elected text only"
-msgstr "S&elected text only"
+msgid "D&efault dictionary:"
+msgstr "D&efault dictionary:"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 99
-#: rc.cpp:563
+#. i18n: file ./kbabel/searchpreferences.ui line 82
+#: rc.cpp:458
 #, no-c-format
-msgid "Spell check only the selected text."
-msgstr "Spell check only the selected text."
+msgid ""
+"<qt>"
+"<p><b>Default Dictionary</b></p>\n"
+"<p>Choose here where to search as default. \n"
+"This setting is used when searching is started automatically \n"
+"or when pressing the dictionary button in the toolbar.</p>\n"
+"<p>You can configure the different dictionaries by selecting \n"
+"the desired dictionary from <b>Settings->Configure Dictionary</b>.\n"
+"</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Default Dictionary</b></p>\n"
+"<p>Choose here where to search as default. \n"
+"This setting is used when searching is started automatically \n"
+"or when pressing the dictionary button in the toolbar.</p>\n"
+"<p>You can configure the different dictionaries by selecting \n"
+"the desired dictionary from <b>Settings->Configure Dictionary</b>.\n"
+"</p></qt>"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 109
-#: rc.cpp:566
+#. i18n: file ./kbabel/fontpreferences.ui line 25
+#: rc.cpp:467
 #, no-c-format
-msgid "U&se this selection as default"
-msgstr "U&se this selection as default"
+msgid "Font for Messages"
+msgstr "Font for Messages"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 112
-#: rc.cpp:569
+#. i18n: file ./kbabel/fontpreferences.ui line 36
+#: rc.cpp:470
 #, no-c-format
-msgid "Check this, to store the current selection as default selection."
-msgstr "Tick this, to store the current selection as default selection."
+msgid "&Show only fixed font"
+msgstr "&Show only fixed font"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 30
-#: rc.cpp:572 rc.cpp:602
+#: rc.cpp:473 rc.cpp:503
 #, no-c-format
 msgid "&Path to Compendium File"
 msgstr "&Path to Compendium File"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 85
-#: rc.cpp:578 rc.cpp:611
+#: rc.cpp:479 rc.cpp:512
 #, no-c-format
 msgid "Onl&y whole words"
 msgstr "Onl&y whole words"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 93
-#: rc.cpp:581 rc.cpp:614
+#: rc.cpp:482 rc.cpp:515
 #, no-c-format
 msgid "Case sensiti&ve"
 msgstr "Case sensiti&ve"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 103
-#: rc.cpp:584 rc.cpp:617
+#: rc.cpp:485 rc.cpp:518
 #, no-c-format
 msgid "A text matches if:"
 msgstr "A text matches if:"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 125
-#: rc.cpp:587 rc.cpp:620
+#: rc.cpp:488 rc.cpp:521
 #, no-c-format
 msgid "E&qual to searched text"
 msgstr "E&qual to searched text"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 133
-#: rc.cpp:590 rc.cpp:623
+#: rc.cpp:491 rc.cpp:524
 #, no-c-format
 msgid "Contains a &word of searched text"
 msgstr "Contains a &word of searched text"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 141
-#: rc.cpp:593 rc.cpp:626
+#: rc.cpp:494 rc.cpp:527
 #, no-c-format
 msgid "Co&ntained in searched text"
 msgstr "Co&ntained in searched text"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 149
-#: rc.cpp:596 rc.cpp:629
+#: rc.cpp:497 rc.cpp:530
 #, no-c-format
 msgid "&Similar to searched text"
 msgstr "&Similar to searched text"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 157
-#: rc.cpp:599 rc.cpp:632
+#: rc.cpp:500 rc.cpp:533
 #, no-c-format
 msgid "Contains searched te&xt"
 msgstr "Contains searched te&xt"
 
 #. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 102
-#: rc.cpp:608
+#: rc.cpp:509
 #, no-c-format
 msgid "Ignore &fuzzy strings"
 msgstr "Ignore &fuzzy strings"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 28
-#: rc.cpp:635
-#, no-c-format
-msgid "General"
-msgstr "General"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 39
-#: rc.cpp:638 rc.cpp:956 rc.cpp:1161
-#, no-c-format
-msgid "Database"
-msgstr "Database"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 50
-#: rc.cpp:641
-#, no-c-format
-msgid "DB folder:"
-msgstr "DB folder:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 63
-#: rc.cpp:644
-#, no-c-format
-msgid "Automatic update in kbabel"
-msgstr "Automatic update in kbabel"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 73
-#: rc.cpp:647
-#, no-c-format
-msgid "New Entries"
-msgstr "New Entries"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 84
-#: kbabeldict/kbabeldictbox.cpp:1268 rc.cpp:650
-#, no-c-format
-msgid "Author:"
-msgstr "Author:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 92
-#: rc.cpp:653
-#, no-c-format
-msgid "From kbabel"
-msgstr "From kbabel"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 126
-#: rc.cpp:656
-#, no-c-format
-msgid "Algorithm"
-msgstr "Algorithm"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 137
-#: rc.cpp:659
-#, no-c-format
-msgid "Minimum score:"
-msgstr "Minimum score:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 176
-#: rc.cpp:662
-#, no-c-format
-msgid "Algorithms to Use"
-msgstr "Algorithms to Use"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 187
-#: rc.cpp:665 rc.cpp:668 rc.cpp:686 rc.cpp:689 rc.cpp:692 rc.cpp:695
-#: rc.cpp:698
-#, no-c-format
-msgid "Score:"
-msgstr "Score:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 213
-#: rc.cpp:671
-#, no-c-format
-msgid "Fuzzy sentence archive"
-msgstr "Fuzzy sentence archive"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 221
-#: rc.cpp:674
-#, no-c-format
-msgid "Glossary"
-msgstr "Glossary"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 229
-#: rc.cpp:677
-#, no-c-format
-msgid "Exact "
-msgstr "Exact "
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 252
-#: rc.cpp:680
-#, no-c-format
-msgid "Sentence by sentence"
-msgstr "Sentence by sentence"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 260
-#: rc.cpp:683
-#, no-c-format
-msgid "Alphanumeric"
-msgstr "Alphanumeric"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 313
-#: rc.cpp:701
-#, no-c-format
-msgid "Word by word"
-msgstr "Word by word"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 321
-#: rc.cpp:704
-#, no-c-format
-msgid "Dynamic dictionary"
-msgstr "Dynamic dictionary"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 336
-#: rc.cpp:707
-#, no-c-format
-msgid "Preferred number of results:"
-msgstr "Preferred number of results:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 356
-#: rc.cpp:710
-#, no-c-format
-msgid "Output"
-msgstr "Output"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 367
-#: rc.cpp:713
-#, no-c-format
-msgid "Output Processing"
-msgstr "Output Processing"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 395
-#: rc.cpp:716
-#, no-c-format
-msgid "First capital letter match"
-msgstr "First capital letter match"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 403
-#: rc.cpp:719
-#, no-c-format
-msgid "All capital letter match"
-msgstr "All capital letter match"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 411
-#: rc.cpp:722
-#, no-c-format
-msgid "Accelerator symbol (&&)"
-msgstr "Accelerator symbol (&&)"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 419
-#: rc.cpp:725
-#, no-c-format
-msgid "Try to use same letter"
-msgstr "Try to use same letter"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 429
-#: rc.cpp:728
-#, no-c-format
-msgid "Custom Rules"
-msgstr "Custom Rules"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 440
-#: rc.cpp:731
-#, no-c-format
-msgid "Original string regexp:"
-msgstr "Original string regexp:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 451
-#: rc.cpp:734
-#, no-c-format
-msgid "Enabled"
-msgstr "Enabled"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 462
-#: rc.cpp:737
-#, no-c-format
-msgid "Description"
-msgstr "Description"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 527
-#: rc.cpp:749
-#, no-c-format
-msgid "Replace string:"
-msgstr "Replace string:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 545
-#: rc.cpp:752
-#, no-c-format
-msgid "Translated regexp(search):"
-msgstr "Translated regexp(search):"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 583
-#: rc.cpp:761
-#, no-c-format
-msgid "Check language"
-msgstr "Check language"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 599
-#: rc.cpp:764
-#, no-c-format
-msgid "Use current filters"
-msgstr "Use current filters"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 615
-#: rc.cpp:767
-#, no-c-format
-msgid "Set date to today"
-msgstr "Set date to today"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 624
-#: rc.cpp:770
-#, no-c-format
-msgid "Sources"
-msgstr "Sources"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 651
-#: rc.cpp:779
-#, no-c-format
-msgid "Scan Now"
-msgstr "Scan Now"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 684
-#: rc.cpp:785
-#, no-c-format
-msgid "Scan All"
-msgstr "Scan All"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 701
-#: rc.cpp:788
-#, no-c-format
-msgid "Filters"
-msgstr "Filters"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 16
-#: rc.cpp:791
-#, no-c-format
-msgid "Edit Source"
-msgstr "Edit Source"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 60
-#: rc.cpp:800
-#, no-c-format
-msgid "Additional Informations"
-msgstr "Additional Informations"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 133
-#: rc.cpp:806
-#, no-c-format
-msgid "Project name:"
-msgstr "Project name:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 149
-#: rc.cpp:809
-#, no-c-format
-msgid "Project keywords:"
-msgstr "Project keywords:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 158
-#: rc.cpp:812
-#, no-c-format
-msgid "General Info"
-msgstr "General Info"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 172
-#: rc.cpp:815
-#, no-c-format
-msgid "Single File"
-msgstr "Single File"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 177
-#: rc.cpp:818
-#, no-c-format
-msgid "Single Folder"
-msgstr "Single Folder"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 182
-#: rc.cpp:821
-#, no-c-format
-msgid "Recursive Folder"
-msgstr "Recursive Folder"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 194
-#: rc.cpp:824
-#, no-c-format
-msgid "Source name:"
-msgstr "Source name:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 207
-#: rc.cpp:827
-#, no-c-format
-msgid "Type:"
-msgstr "Type:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 215
-#: rc.cpp:830
-#, no-c-format
-msgid "Setup Filter..."
-msgstr "Setup Filter..."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 223
-#: rc.cpp:833
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 39
+#: rc.cpp:536
 #, no-c-format
-msgid "Location:"
-msgstr "Location:"
+msgid "&Path to auxiliary file:"
+msgstr "&Path to auxiliary file:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 231
-#: rc.cpp:836
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 61
+#: rc.cpp:539
 #, no-c-format
-msgid "Use filter"
-msgstr "Use filter"
+msgid "&Ignore fuzzy entries"
+msgstr "&Ignore fuzzy entries"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 17
-#: rc.cpp:839
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 78
+#: rc.cpp:542
 #, no-c-format
-msgid "DBSEPrefWidget"
-msgstr "DBSEPrefWidget"
+msgid ""
+"<qt>"
+"<p>\n"
+"The following variables will be replaced in the path if available:\n"
+"<ul>\n"
+"<li><b>@PACKAGE@</b>: the name of the currently translated application or "
+"package</li>\n"
+"<li><b>@LANG@</b>: the language code</li>\n"
+"<li><b>@DIR<em>n</em>@</b>: where n is a positive integer. This expands to the "
+"nth folder counted from the filename</li>\n"
+"</ul></p></qt>"
+msgstr ""
+"<qt>"
+"<p>\n"
+"The following variables will be replaced in the path if available:\n"
+"<ul>\n"
+"<li><b>@PACKAGE@</b>: the name of the currently translated application or "
+"package</li>\n"
+"<li><b>@LANG@</b>: the language code</li>\n"
+"<li><b>@DIR<em>n</em>@</b>: where n is a positive integer. This expands to the "
+"nth folder counted from the filename</li>\n"
+"</ul></p></qt>"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 41
-#: rc.cpp:842 rc.cpp:1010 rc.cpp:1047 rc.cpp:1215
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 38
+#: rc.cpp:551 rc.cpp:719 rc.cpp:963 rc.cpp:1131
 #, no-c-format
 msgid "Generic"
 msgstr "Generic"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 58
-#: rc.cpp:845 rc.cpp:1050
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 55
+#: rc.cpp:554 rc.cpp:966
 #, no-c-format
 msgid "Search Mode"
 msgstr "Search Mode"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 75
-#: rc.cpp:848 rc.cpp:1053
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 72
+#: rc.cpp:557 rc.cpp:969
 #, no-c-format
 msgid "Search in whole database (slow)"
 msgstr "Search in whole database (slow)"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 80
-#: rc.cpp:851 rc.cpp:1056
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 77
+#: rc.cpp:560 rc.cpp:972
 #, no-c-format
 msgid ""
 "<qml>Scroll the whole database and return everything that matches \n"
@@ -5268,14 +3875,14 @@ msgstr ""
 "according to the rules defined in tabs <strong> Generic </strong>\n"
 "and <strong>Match</strong>"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 88
-#: rc.cpp:856 rc.cpp:1061
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 85
+#: rc.cpp:565 rc.cpp:977
 #, no-c-format
 msgid "Search in list of \"good keys\" (best)"
 msgstr "Search in list of \"good keys\" (best)"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 95
-#: rc.cpp:859 rc.cpp:1064
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 92
+#: rc.cpp:568 rc.cpp:980
 #, no-c-format
 msgid ""
 "<qml>Search in a list of <em>good keys</em> (see <strong>Good keys</strong> "
@@ -5290,14 +3897,14 @@ msgstr ""
 "list probably contains all the keys that match with your query. However, it is "
 "smaller than the whole database."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 103
-#: rc.cpp:863 rc.cpp:1068
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 100
+#: rc.cpp:572 rc.cpp:984
 #, no-c-format
 msgid "Return the list of \"good keys\" (fast)"
 msgstr "Return the list of \"good keys\" (fast)"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 106
-#: rc.cpp:866 rc.cpp:1071
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 103
+#: rc.cpp:575 rc.cpp:987
 #, no-c-format
 msgid ""
 "<qml>Returns the whole <em>good keys</em> list. Rules defined in <strong>"
@@ -5306,14 +3913,14 @@ msgstr ""
 "<qml>Returns the whole <em>good keys</em> list. Rules defined in <strong>"
 "Search</strong> tab are ignored."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 116
-#: rc.cpp:869 rc.cpp:1074
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 113
+#: rc.cpp:578 rc.cpp:990
 #, no-c-format
 msgid "Case sensitive"
 msgstr "Case sensitive"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 119
-#: rc.cpp:872 rc.cpp:1077
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 116
+#: rc.cpp:581 rc.cpp:993
 #, no-c-format
 msgid ""
 "<qml>If it is checked the search will be case sensitive. It is ignored if you "
@@ -5322,14 +3929,14 @@ msgstr ""
 "<qml>If it is ticked the search will be case sensitive. It is ignored if you "
 "use <em>Return the list of \"good keys\"</em> search mode."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 127
-#: rc.cpp:875 rc.cpp:1080
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 124
+#: rc.cpp:584 rc.cpp:996
 #, no-c-format
 msgid "Normalize white space"
 msgstr "Normalise white space"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 134
-#: rc.cpp:878 rc.cpp:1083
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 131
+#: rc.cpp:587 rc.cpp:999
 #, no-c-format
 msgid ""
 "Remove white spaces at the beginning and at the end of the phrase.\n"
@@ -5340,104 +3947,104 @@ msgstr ""
 "It also substitutes groups of more than one space character with only one space "
 "character."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 142
-#: rc.cpp:882 rc.cpp:1087
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 139
+#: rc.cpp:591 rc.cpp:1003
 #, no-c-format
 msgid "Remove context comment"
 msgstr "Remove context comment"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 148
-#: rc.cpp:885 rc.cpp:1090
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 145
+#: rc.cpp:594 rc.cpp:1006
 #, no-c-format
 msgid "Remove, if exists, the _:comment"
 msgstr "Remove, if exists, the _:comment"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 170
-#: rc.cpp:888 rc.cpp:1093
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 167
+#: rc.cpp:597 rc.cpp:1009
 #, no-c-format
 msgid "Character to be ignored:"
 msgstr "Character to be ignored:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 212
-#: rc.cpp:891 rc.cpp:1096
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 209
+#: rc.cpp:600 rc.cpp:1012
 #, no-c-format
 msgid "Search"
 msgstr "Search"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 229
-#: rc.cpp:894 rc.cpp:1099
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 226
+#: rc.cpp:603 rc.cpp:1015
 #, no-c-format
 msgid "Matching Method"
 msgstr "Matching Method"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 280
-#: rc.cpp:897 rc.cpp:1102
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 277
+#: rc.cpp:606 rc.cpp:1018
 #, no-c-format
 msgid "Query is contained"
 msgstr "Query is contained"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 283
-#: rc.cpp:900 rc.cpp:1105
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 280
+#: rc.cpp:609 rc.cpp:1021
 #, no-c-format
 msgid "Match if query is contained in database string"
 msgstr "Match if query is contained in database string"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 291
-#: rc.cpp:903 rc.cpp:1108
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 288
+#: rc.cpp:612 rc.cpp:1024
 #, no-c-format
 msgid "Query contains"
 msgstr "Query contains"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 294
-#: rc.cpp:906 rc.cpp:1111
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 291
+#: rc.cpp:615 rc.cpp:1027
 #, no-c-format
 msgid "Match if query contains the database string"
 msgstr "Match if query contains the database string"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 302
-#: rc.cpp:909 rc.cpp:1114
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 299
+#: rc.cpp:618 rc.cpp:1030
 #, no-c-format
 msgid "Normal text"
 msgstr "Normal text"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 308
-#: rc.cpp:912 rc.cpp:1117
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 305
+#: rc.cpp:621 rc.cpp:1033
 #, no-c-format
 msgid "Consider the search string as normal text."
 msgstr "Consider the search string as normal text."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 316
-#: rc.cpp:915 rc.cpp:1120
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 313
+#: rc.cpp:624 rc.cpp:1036
 #, no-c-format
 msgid "Equal"
 msgstr "Equal"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 325
-#: rc.cpp:918 rc.cpp:1123
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 322
+#: rc.cpp:627 rc.cpp:1039
 #, no-c-format
 msgid "Match if query and database string are equal"
 msgstr "Match if query and database string are equal"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 350
-#: rc.cpp:921 rc.cpp:1126
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 347
+#: rc.cpp:630 rc.cpp:1042
 #, no-c-format
 msgid "Regular expression"
 msgstr "Regular expression"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 353
-#: rc.cpp:924 rc.cpp:1129
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 350
+#: rc.cpp:633 rc.cpp:1045
 #, no-c-format
 msgid "Consider the search string as a regular expression"
 msgstr "Consider the search string as a regular expression"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 363
-#: rc.cpp:927 rc.cpp:1132
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 360
+#: rc.cpp:636 rc.cpp:1048
 #, no-c-format
 msgid "Word Substitution"
 msgstr "Word Substitution"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 368
-#: rc.cpp:930 rc.cpp:1135
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 365
+#: rc.cpp:639 rc.cpp:1051
 #, no-c-format
 msgid ""
 "<qml>If you use one or two <em>word substitution</em> "
@@ -5462,56 +4069,62 @@ msgstr ""
 "one word substitution</em> you may also find phrases like <em>"
 "My name is Joe</em> or <em>Your name is Andrea</em>."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 402
-#: rc.cpp:935 rc.cpp:1140
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 399
+#: rc.cpp:644 rc.cpp:1056
 #, no-c-format
 msgid "Use one word substitution"
 msgstr "Use one word substitution"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 433
-#: rc.cpp:938 rc.cpp:944 rc.cpp:1143 rc.cpp:1149
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 430
+#: rc.cpp:647 rc.cpp:653 rc.cpp:1059 rc.cpp:1065
 #, no-c-format
 msgid "Max number of words in the query:"
 msgstr "Max number of words in the query:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 458
-#: rc.cpp:941 rc.cpp:1146
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 455
+#: rc.cpp:650 rc.cpp:1062
 #, no-c-format
 msgid "Use two word substitution"
 msgstr "Use two word substitution"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 491
-#: rc.cpp:947 rc.cpp:1152
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 488
+#: rc.cpp:656 rc.cpp:1068
 #, no-c-format
 msgid "[A-Za-z0-9_%"
 msgstr "[A-Za-z0-9_%"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 509
-#: rc.cpp:950 rc.cpp:1155
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 506
+#: rc.cpp:659 rc.cpp:1071
 #, no-c-format
 msgid "]"
 msgstr "]"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 519
-#: rc.cpp:953 rc.cpp:1158
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 516
+#: rc.cpp:662 rc.cpp:1074
 #, no-c-format
 msgid "Local characters for regular expressions:"
 msgstr "Local characters for regular expressions:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 573
-#: rc.cpp:959 rc.cpp:1164
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 553
+#: rc.cpp:665 rc.cpp:759 rc.cpp:1077
+#, no-c-format
+msgid "Database"
+msgstr "Database"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 570
+#: rc.cpp:668 rc.cpp:1080
 #, no-c-format
 msgid "Database folder:"
 msgstr "Database folder:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 589
-#: rc.cpp:962 rc.cpp:1167
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 586
+#: rc.cpp:671 rc.cpp:1083
 #, no-c-format
 msgid "Auto add entry to database"
 msgstr "Auto add entry to database"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 595
-#: rc.cpp:965 rc.cpp:1170
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 592
+#: rc.cpp:674 rc.cpp:1086
 #, no-c-format
 msgid ""
 "Automatically add an entry to the database if a new translation is notified by "
@@ -5520,14 +4133,14 @@ msgstr ""
 "Automatically add an entry to the database if a new translation is notified by "
 "someone (may be KBabel)"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 617
-#: rc.cpp:968 rc.cpp:1173
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 614
+#: rc.cpp:677 rc.cpp:1089
 #, no-c-format
 msgid "Auto added entry author:"
 msgstr "Auto added entry author:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 625
-#: rc.cpp:971 rc.cpp:1176
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 622
+#: rc.cpp:680 rc.cpp:1092
 #, no-c-format
 msgid ""
 "<qml>Put here the name and email address that you want to use as <em>"
@@ -5540,74 +4153,80 @@ msgstr ""
 "you modify a translation with KBabel)."
 "<p>"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 635
-#: rc.cpp:974
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 632
+#: rc.cpp:683
 #, no-c-format
-msgid "Scan Single PO File"
-msgstr "Scan Single PO File"
+msgid "Scan Single PO File..."
+msgstr "Scan Single PO File..."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 643
-#: rc.cpp:977
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 640
+#: rc.cpp:686
 #, no-c-format
-msgid "Scan Folder"
-msgstr "Scan Folder"
+msgid "Scan Folder..."
+msgstr "Scan Folder..."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 651
-#: rc.cpp:980
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 648
+#: rc.cpp:689
 #, no-c-format
-msgid "Scan Folder && Subfolders"
-msgstr "Scan Folder && Subfolders"
+msgid "Scan Folder && Subfolders..."
+msgstr "Scan Folder && Subfolders..."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 673
-#: rc.cpp:983 rc.cpp:1188
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 670
+#: rc.cpp:692 rc.cpp:1104
 #, no-c-format
 msgid "Scanning file:"
 msgstr "Scanning file:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 681
-#: rc.cpp:986 rc.cpp:1191
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 678
+#: rc.cpp:695 rc.cpp:1107
 #, no-c-format
 msgid "Entries added:"
 msgstr "Entries added:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 722
-#: rc.cpp:989 rc.cpp:1194
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 719
+#: rc.cpp:698 rc.cpp:1110
 #, no-c-format
 msgid "Total progress:"
 msgstr "Total progress:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 730
-#: rc.cpp:992 rc.cpp:1197
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 727
+#: rc.cpp:701 rc.cpp:1113
 #, no-c-format
 msgid "Processing file:"
 msgstr "Processing file:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 766
-#: rc.cpp:995 rc.cpp:1200
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 763
+#: rc.cpp:704 rc.cpp:1116
 #, no-c-format
 msgid "Loading file:"
 msgstr "Loading file:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 779
-#: rc.cpp:998 rc.cpp:1203
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 776
+#: rc.cpp:707 rc.cpp:1119
 #, no-c-format
 msgid "Export..."
 msgstr "Export..."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 798
-#: rc.cpp:1004 rc.cpp:1209
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 787
+#: catalogmanager/catalogmanagerview.cpp:795 rc.cpp:710 rc.cpp:1122
+#, no-c-format
+msgid "Statistics"
+msgstr "Statistics"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 795
+#: rc.cpp:713 rc.cpp:1125
 #, no-c-format
 msgid "Repeated Strings"
 msgstr "Repeated Strings"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 808
-#: rc.cpp:1007 rc.cpp:1212
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 805
+#: rc.cpp:716 rc.cpp:1128
 #, no-c-format
 msgid "Good Keys"
 msgstr "Good Keys"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 832
-#: rc.cpp:1013 rc.cpp:1218
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 829
+#: rc.cpp:722 rc.cpp:1134
 #, no-c-format
 msgid ""
 "<qml>Here you can define how to fill the <em>good keys list</em>."
@@ -5636,228 +4255,517 @@ msgstr ""
 "<p>\n"
 "Finally you can set the maximum number of entries in the list."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 849
-#: rc.cpp:1020 rc.cpp:1225
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 846
+#: rc.cpp:729 rc.cpp:1141
 #, no-c-format
 msgid "Minimum number of words of the key also in the query (%):"
 msgstr "Minimum number of words of the key also in the query (%):"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 874
-#: rc.cpp:1023 rc.cpp:1029 rc.cpp:1228 rc.cpp:1234
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 871
+#: rc.cpp:732 rc.cpp:738 rc.cpp:1144 rc.cpp:1150
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 888
-#: rc.cpp:1026 rc.cpp:1231
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 885
+#: rc.cpp:735 rc.cpp:1147
 #, no-c-format
 msgid "Minimum number of query words in the key (%):"
 msgstr "Minimum number of query words in the key (%):"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 921
-#: rc.cpp:1032 rc.cpp:1237
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 918
+#: rc.cpp:741 rc.cpp:1153
 #, no-c-format
 msgid "Max list length:"
 msgstr "Max list length:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 945
-#: rc.cpp:1035 rc.cpp:1240
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 942
+#: rc.cpp:744 rc.cpp:1156
 #, no-c-format
 msgid "Frequent Words"
 msgstr "Frequent Words"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 962
-#: rc.cpp:1038 rc.cpp:1243
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 959
+#: rc.cpp:747 rc.cpp:1159
 #, no-c-format
 msgid "Discard words more frequent than:"
 msgstr "Discard words more frequent than:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 970
-#: rc.cpp:1041 rc.cpp:1246
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 967
+#: rc.cpp:750 rc.cpp:1162
 #, no-c-format
 msgid "/10000"
 msgstr "/10000"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 987
-#: rc.cpp:1044 rc.cpp:1249
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 984
+#: rc.cpp:753 rc.cpp:1165
 #, no-c-format
 msgid "Frequent words are considered as in every key"
 msgstr "Frequent words are considered as in every key"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 632
-#: rc.cpp:1179
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 28
+#: rc.cpp:756
 #, no-c-format
-msgid "Scan Single PO File..."
-msgstr "Scan Single PO File..."
+msgid "General"
+msgstr "General"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 640
-#: rc.cpp:1182
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 50
+#: rc.cpp:762
 #, no-c-format
-msgid "Scan Folder..."
-msgstr "Scan Folder..."
+msgid "DB folder:"
+msgstr "DB folder:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 648
-#: rc.cpp:1185
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 63
+#: rc.cpp:765
 #, no-c-format
-msgid "Scan Folder && Subfolders..."
-msgstr "Scan Folder && Subfolders..."
+msgid "Automatic update in kbabel"
+msgstr "Automatic update in kbabel"
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 39
-#: rc.cpp:1252
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 73
+#: rc.cpp:768
 #, no-c-format
-msgid "&Path to auxiliary file:"
-msgstr "&Path to auxiliary file:"
+msgid "New Entries"
+msgstr "New Entries"
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 61
-#: rc.cpp:1255
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 84
+#: kbabeldict/kbabeldictbox.cpp:1268 rc.cpp:771
 #, no-c-format
-msgid "&Ignore fuzzy entries"
-msgstr "&Ignore fuzzy entries"
+msgid "Author:"
+msgstr "Author:"
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 78
-#: rc.cpp:1258
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 92
+#: rc.cpp:774
 #, no-c-format
-msgid ""
-"<qt>"
-"<p>\n"
-"The following variables will be replaced in the path if available:\n"
-"<ul>\n"
-"<li><b>@PACKAGE@</b>: the name of the currently translated application or "
-"package</li>\n"
-"<li><b>@LANG@</b>: the language code</li>\n"
-"<li><b>@DIR<em>n</em>@</b>: where n is a positive integer. This expands to the "
-"nth folder counted from the filename</li>\n"
-"</ul></p></qt>"
-msgstr ""
-"<qt>"
-"<p>\n"
-"The following variables will be replaced in the path if available:\n"
-"<ul>\n"
-"<li><b>@PACKAGE@</b>: the name of the currently translated application or "
-"package</li>\n"
-"<li><b>@LANG@</b>: the language code</li>\n"
-"<li><b>@DIR<em>n</em>@</b>: where n is a positive integer. This expands to the "
-"nth folder counted from the filename</li>\n"
-"</ul></p></qt>"
+msgid "From kbabel"
+msgstr "From kbabel"
 
-#: kbabeldict/kbabeldictbox.cpp:201
-msgid "Total:"
-msgstr "Total:"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 126
+#: rc.cpp:777
+#, no-c-format
+msgid "Algorithm"
+msgstr "Algorithm"
 
-#: kbabeldict/kbabeldictbox.cpp:216
-msgid "Found in:"
-msgstr "Found in:"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 137
+#: rc.cpp:780
+#, no-c-format
+msgid "Minimum score:"
+msgstr "Minimum score:"
 
-#: kbabeldict/kbabeldictbox.cpp:224
-msgid "Translator:"
-msgstr "Translator:"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 176
+#: rc.cpp:783
+#, no-c-format
+msgid "Algorithms to Use"
+msgstr "Algorithms to Use"
 
-#: kbabeldict/kbabeldictbox.cpp:236
-msgid "Date:"
-msgstr "Date:"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 187
+#: rc.cpp:786 rc.cpp:789 rc.cpp:807 rc.cpp:810 rc.cpp:813 rc.cpp:816
+#: rc.cpp:819
+#, no-c-format
+msgid "Score:"
+msgstr "Score:"
 
-#: kbabeldict/kbabeldictbox.cpp:244
-msgid "&More"
-msgstr "&More"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 213
+#: rc.cpp:792
+#, no-c-format
+msgid "Fuzzy sentence archive"
+msgstr "Fuzzy sentence archive"
 
-#: kbabeldict/kbabeldictbox.cpp:287
-msgid "Score"
-msgstr "Score"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 221
+#: rc.cpp:795
+#, no-c-format
+msgid "Glossary"
+msgstr "Glossary"
 
-#: kbabeldict/kbabeldictbox.cpp:288
-msgid "Original"
-msgstr "Original"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 229
+#: rc.cpp:798
+#, no-c-format
+msgid "Exact "
+msgstr "Exact "
 
-#: kbabeldict/kbabeldictbox.cpp:289
-msgid "Translation"
-msgstr "Translation"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 252
+#: rc.cpp:801
+#, no-c-format
+msgid "Sentence by sentence"
+msgstr "Sentence by sentence"
 
-#: kbabeldict/kbabeldictbox.cpp:290
-msgid "Location"
-msgstr "Location"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 260
+#: rc.cpp:804
+#, no-c-format
+msgid "Alphanumeric"
+msgstr "Alphanumeric"
 
-#: kbabeldict/kbabeldictbox.cpp:313
-msgid "< &Previous"
-msgstr "< &Previous"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 313
+#: rc.cpp:822
+#, no-c-format
+msgid "Word by word"
+msgstr "Word by word"
 
-#: kbabeldict/kbabeldictbox.cpp:318
-msgid "&Next >"
-msgstr "&Next >"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 321
+#: rc.cpp:825
+#, no-c-format
+msgid "Dynamic dictionary"
+msgstr "Dynamic dictionary"
 
-#: kbabeldict/kbabeldictbox.cpp:957 kbabeldict/kbabeldictbox.cpp:1015
-#: kbabeldict/kbabeldictbox.cpp:1027 kbabeldict/kbabeldictbox.cpp:1128
-#: kbabeldict/kbabeldictbox.cpp:1190 kbabeldict/kbabeldictbox.cpp:1449
-msgid "Edit File"
-msgstr "Edit File"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 336
+#: rc.cpp:828
+#, no-c-format
+msgid "Preferred number of results:"
+msgstr "Preferred number of results:"
 
-#: kbabeldict/kbabeldictbox.cpp:1010 kbabeldict/kbabeldictbox.cpp:1185
-#, c-format
-msgid "Edit File %1"
-msgstr "Edit File %1"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 356
+#: rc.cpp:831
+#, no-c-format
+msgid "Output"
+msgstr "Output"
 
-#: kbabeldict/kbabeldictbox.cpp:1257
-#, c-format
-msgid "Send bugs to %1"
-msgstr "Send bugs to %1"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 367
+#: rc.cpp:834
+#, no-c-format
+msgid "Output Processing"
+msgstr "Output Processing"
 
-#: kbabeldict/kbabeldictbox.cpp:1270
-msgid "Authors:"
-msgstr "Authors:"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 395
+#: rc.cpp:837
+#, no-c-format
+msgid "First capital letter match"
+msgstr "First capital letter match"
 
-#: kbabeldict/kbabeldictbox.cpp:1286
-msgid "Thanks to:"
-msgstr "Thanks to:"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 403
+#: rc.cpp:840
+#, no-c-format
+msgid "All capital letter match"
+msgstr "All capital letter match"
 
-#: kbabeldict/kbabeldictbox.cpp:1302
-msgid "No information available."
-msgstr "No information available."
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 411
+#: rc.cpp:843
+#, no-c-format
+msgid "Accelerator symbol (&&)"
+msgstr "Accelerator symbol (&&)"
 
-#: kbabeldict/kbabeldictbox.cpp:1505
-#, c-format
-msgid "Configure Dictionary %1"
-msgstr "Configure Dictionary %1"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 419
+#: rc.cpp:846
+#, no-c-format
+msgid "Try to use same letter"
+msgstr "Try to use same letter"
 
-#: kbabeldict/kbabeldictbox.cpp:1698
-#, c-format
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 429
+#: rc.cpp:849
+#, no-c-format
+msgid "Custom Rules"
+msgstr "Custom Rules"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 440
+#: rc.cpp:852
+#, no-c-format
+msgid "Original string regexp:"
+msgstr "Original string regexp:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 451
+#: rc.cpp:855
+#, no-c-format
+msgid "Enabled"
+msgstr "Enabled"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 462
+#: rc.cpp:858
+#, no-c-format
+msgid "Description"
+msgstr "Description"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 527
+#: rc.cpp:870
+#, no-c-format
+msgid "Replace string:"
+msgstr "Replace string:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 545
+#: rc.cpp:873
+#, no-c-format
+msgid "Translated regexp(search):"
+msgstr "Translated regexp(search):"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 583
+#: rc.cpp:882
+#, no-c-format
+msgid "Check language"
+msgstr "Check language"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 599
+#: rc.cpp:885
+#, no-c-format
+msgid "Use current filters"
+msgstr "Use current filters"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 615
+#: rc.cpp:888
+#, no-c-format
+msgid "Set date to today"
+msgstr "Set date to today"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 624
+#: rc.cpp:891
+#, no-c-format
+msgid "Sources"
+msgstr "Sources"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 651
+#: rc.cpp:900
+#, no-c-format
+msgid "Scan Now"
+msgstr "Scan Now"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 684
+#: rc.cpp:906
+#, no-c-format
+msgid "Scan All"
+msgstr "Scan All"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 701
+#: rc.cpp:909
+#, no-c-format
+msgid "Filters"
+msgstr "Filters"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 16
+#: rc.cpp:912
+#, no-c-format
+msgid "Edit Source"
+msgstr "Edit Source"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 60
+#: rc.cpp:921
+#, no-c-format
+msgid "Additional Informations"
+msgstr "Additional Informations"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 133
+#: rc.cpp:927
+#, no-c-format
+msgid "Project name:"
+msgstr "Project name:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 149
+#: rc.cpp:930
+#, no-c-format
+msgid "Project keywords:"
+msgstr "Project keywords:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 158
+#: rc.cpp:933
+#, no-c-format
+msgid "General Info"
+msgstr "General Info"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 172
+#: rc.cpp:936
+#, no-c-format
+msgid "Single File"
+msgstr "Single File"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 177
+#: rc.cpp:939
+#, no-c-format
+msgid "Single Folder"
+msgstr "Single Folder"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 182
+#: rc.cpp:942
+#, no-c-format
+msgid "Recursive Folder"
+msgstr "Recursive Folder"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 194
+#: rc.cpp:945
+#, no-c-format
+msgid "Source name:"
+msgstr "Source name:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 207
+#: rc.cpp:948
+#, no-c-format
+msgid "Type:"
+msgstr "Type:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 215
+#: rc.cpp:951
+#, no-c-format
+msgid "Setup Filter..."
+msgstr "Setup Filter..."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 223
+#: rc.cpp:954
+#, no-c-format
+msgid "Location:"
+msgstr "Location:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 231
+#: rc.cpp:957
+#, no-c-format
+msgid "Use filter"
+msgstr "Use filter"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 17
+#: rc.cpp:960
+#, no-c-format
+msgid "DBSEPrefWidget"
+msgstr "DBSEPrefWidget"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 635
+#: rc.cpp:1095
+#, no-c-format
+msgid "Scan Single PO File"
+msgstr "Scan Single PO File"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 643
+#: rc.cpp:1098
+#, no-c-format
+msgid "Scan Folder"
+msgstr "Scan Folder"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 651
+#: rc.cpp:1101
+#, no-c-format
+msgid "Scan Folder && Subfolders"
+msgstr "Scan Folder && Subfolders"
+
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 30
+#: rc.cpp:1174
+#, no-c-format
+msgid "&Markings"
+msgstr "&Markings"
+
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 60
+#: rc.cpp:1183 rc.cpp:1201 rc.cpp:1207
+#, no-c-format
+msgid "CVS"
+msgstr "CVS"
+
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 78
+#: catalogmanager/future.cpp:4 rc.cpp:1186 rc.cpp:1204 rc.cpp:1210
+#, no-c-format
+msgid "SVN"
+msgstr "SVN"
+
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 24
+#: rc.cpp:1213
+#, no-c-format
+msgid "To be set dynamically:"
+msgstr "To be set dynamically:"
+
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 62
+#: rc.cpp:1222
+#, no-c-format
+msgid "&Include templates"
+msgstr "&Include templates"
+
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 70
+#: rc.cpp:1225
+#, no-c-format
+msgid "Use &wildcards"
+msgstr "Use &wildcards"
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 38
+#: kbabeldict/kbabeldictbox.cpp:208 rc.cpp:1234
+#, no-c-format
+msgid "Current:"
+msgstr "Current:"
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 59
+#: rc.cpp:1237
+#, no-c-format
+msgid "Overall:"
+msgstr "Overall:"
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 80
+#: rc.cpp:1240
+#, no-c-format
+msgid "Current file:"
+msgstr "Current file:"
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 88
+#: rc.cpp:1243
+#, no-c-format
+msgid "Validation:"
+msgstr "Validation:"
+
+#. i18n: file ./catalogmanager/validationoptions.ui line 32
+#: rc.cpp:1249
+#, no-c-format
+msgid "Mark invalid as &fuzzy"
+msgstr "Mark invalid as &fuzzy"
+
+#. i18n: file ./catalogmanager/validationoptions.ui line 39
+#: rc.cpp:1252
+#, no-c-format
 msgid ""
-"There was an error starting KBabel:\n"
-"%1"
+"<qt>"
+"<p><b>Mark invalid as fuzzy</b>"
+"<p>\n"
+"<p>If you select this option, all items,\n"
+"which identifies the tool as invalid, will be\n"
+"marked as fuzzy and the resulting file\n"
+"will be saved.</p></qt>"
 msgstr ""
-"There was an error starting KBabel:\n"
-"%1"
+"<qt>"
+"<p><b>Mark invalid as fuzzy</b>"
+"<p>\n"
+"<p>If you select this option, all items,\n"
+"which identifies the tool as invalid, will be\n"
+"marked as fuzzy and the resulting file\n"
+"will be saved.</p></qt>"
 
-#: kbabeldict/kbabeldictbox.cpp:1712
-msgid "There was an error using DCOP."
-msgstr "There was an error using DCOP."
+#. i18n: file ./catalogmanager/validationoptions.ui line 47
+#: rc.cpp:1259
+#, no-c-format
+msgid "&Do not validate fuzzy"
+msgstr "&Do not validate fuzzy"
 
-#: kbabeldict/kbabeldictbox.cpp:1738
+#. i18n: file ./catalogmanager/validationoptions.ui line 52
+#: rc.cpp:1262
+#, no-c-format
 msgid ""
-"The \"Translation Database\" module\n"
-"appears not to be installed on your system."
+"<qt>"
+"<p><b>Do not validate fuzzy</b>"
+"<p>\n"
+"<p>If you select this option, all items\n"
+"marked as fuzzy will not be validated at all.</p></qt>"
 msgstr ""
-"The \"Translation Database\" module\n"
-"appears not to be installed on your system."
+"<qt>"
+"<p><b>Do not validate fuzzy</b>"
+"<p>\n"
+"<p>If you select this option, all items\n"
+"marked as fuzzy will not be validated at all.</p></qt>"
 
-#: kbabeldict/main.cpp:114
-msgid "KBabel - Dictionary"
-msgstr "KBabel - Dictionary"
+#: kbabeldict/aboutmoduledlg.cpp:42
+msgid "Report Bug..."
+msgstr "Report Bug..."
 
-#: kbabeldict/main.cpp:115
-msgid "A dictionary for translators"
-msgstr "A dictionary for translators"
+#: kbabeldict/kbabeldictview.cpp:83
+msgid "Search in module:"
+msgstr "Search in module:"
 
-#: kbabeldict/main.cpp:116
-msgid "(c) 2000,2001,2002,2003 The KBabeldict developers"
-msgstr "(c) 2000,2001,2002,2003 The KBabeldict developers"
+#: kbabeldict/kbabeldictview.cpp:106
+msgid "&Start Search"
+msgstr "&Start Search"
+
+#: kbabeldict/kbabeldictview.cpp:108
+msgid "Sea&rch in translations"
+msgstr "Sea&rch in translations"
+
+#: kbabeldict/kbabeldictview.cpp:125
+msgid "Settings:"
+msgstr "Settings:"
 
 #: kbabeldict/modules/tmx/pc_factory.cpp:95
 #: kbabeldict/modules/tmx/tmxcompendium.cpp:175
 msgid "TMX Compendium"
 msgstr "TMX Compendium"
 
-#: kbabeldict/modules/tmx/pc_factory.cpp:97
-msgid "A module for searching in a TMX file"
-msgstr "A module for searching in a TMX file"
+#: kbabeldict/modules/pocompendium/compendiumdata.cpp:79
+#: kbabeldict/modules/pocompendium/pocompendium.cpp:1195
+#: kbabeldict/modules/tmx/tmxcompendium.cpp:957
+msgid "Loading PO compendium"
+msgstr "Loading PO compendium"
 
 #: kbabeldict/modules/tmx/preferenceswidget.cpp:88
 msgid ""
@@ -5908,12 +4816,6 @@ msgstr ""
 "<p><b>Location</b></p>"
 "<p>Configure here which file is to be used for searching.</p></qt>"
 
-#: kbabeldict/modules/pocompendium/compendiumdata.cpp:79
-#: kbabeldict/modules/pocompendium/pocompendium.cpp:1195
-#: kbabeldict/modules/tmx/tmxcompendium.cpp:957
-msgid "Loading PO compendium"
-msgstr "Loading PO compendium"
-
 #: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:80
 msgid "Loading TMX compendium"
 msgstr "Loading TMX compendium"
@@ -5950,14 +4852,23 @@ msgstr "Building indices"
 msgid "Empty database."
 msgstr "Empty database."
 
+#: kbabeldict/modules/tmx/pc_factory.cpp:97
+msgid "A module for searching in a TMX file"
+msgstr "A module for searching in a TMX file"
+
 #: kbabeldict/modules/pocompendium/pc_factory.cpp:95
 #: kbabeldict/modules/pocompendium/pocompendium.cpp:184
 msgid "PO Compendium"
 msgstr "PO Compendium"
 
-#: kbabeldict/modules/pocompendium/pc_factory.cpp:97
-msgid "A module for searching in a PO file"
-msgstr "A module for searching in a PO file"
+#: kbabeldict/modules/pocompendium/compendiumdata.cpp:93
+#, c-format
+msgid ""
+"Error while trying to read file for PO Compendium module:\n"
+"%1"
+msgstr ""
+"Error while trying to read file for PO Compendium module:\n"
+"%1"
 
 #: kbabeldict/modules/pocompendium/preferenceswidget.cpp:88
 msgid ""
@@ -5973,15 +4884,36 @@ msgstr ""
 "to perform a case sensitive search, or if you want fuzzy messages to be "
 "ignored.</p></qt>"
 
-#: kbabeldict/modules/pocompendium/compendiumdata.cpp:93
+#: kbabeldict/modules/pocompendium/pc_factory.cpp:97
+msgid "A module for searching in a PO file"
+msgstr "A module for searching in a PO file"
+
+#: kbabeldict/modules/poauxiliary/pa_factory.cpp:95
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:147
+msgid "PO Auxiliary"
+msgstr "PO Auxiliary"
+
+#: kbabeldict/modules/poauxiliary/pa_factory.cpp:97
+msgid "A simple module for exact searching in a PO file"
+msgstr "A simple module for exact searching in a PO file"
+
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:426
+msgid "Loading PO auxiliary"
+msgstr "Loading PO auxiliary"
+
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:438
 #, c-format
 msgid ""
-"Error while trying to read file for PO Compendium module:\n"
+"Error while trying to open file for PO Auxiliary module:\n"
 "%1"
 msgstr ""
-"Error while trying to read file for PO Compendium module:\n"
+"Error while trying to open file for PO Auxiliary module:\n"
 "%1"
 
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:450
+msgid "Building index"
+msgstr "Building index"
+
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1412
 #: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:67
 #: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:68
@@ -5993,72 +4925,9 @@ msgstr "Translation Database"
 msgid "A fast translation search engine based on databases"
 msgstr "A fast translation search engine based on databases"
 
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:72
-msgid "Copyright 2000-2003 by Andrea Rizzi"
-msgstr "Copyright 2000-2003 by Andrea Rizzi"
-
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:182
-msgid "CHUNK BY CHUNK"
-msgstr "CHUNK BY CHUNK"
-
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:183
-msgid ""
-"<h3>Chunk by chunk</h3>CHANGE THIS TEXT!!!!This translation isobtained "
-"translating the  sentences and using afuzzy sentence translation database."
-"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
-"<br>"
-msgstr ""
-"<h3>Chunk by chunk</h3>CHANGE THIS TEXT!!!!This translation isobtained "
-"translating the  sentences and using a fuzzy sentence translation database."
-"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
-"<br>"
-
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:374
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:386
-msgid "DYNAMIC DICT:"
-msgstr "DYNAMIC DICT:"
-
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:375
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:387
-msgid ""
-"<h3>Dynamic Dictionary</h3>This is a dynamic dictionary created looking for "
-"correlation of original and translated words."
-"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
-"<br>"
-msgstr ""
-"<h3>Dynamic Dictionary</h3>This is a dynamic dictionary created looking for "
-"correlation of original and translated words."
-"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
-"<br>"
-
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
-msgid "Create Database"
-msgstr "Create Database"
-
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
-msgid "Create"
-msgstr "Create"
-
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
-msgid "Do Not Create"
-msgstr "Do Not Create"
-
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:562
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:614
-msgid ""
-"The name you chose is already used.\n"
-"Please change the source name."
-msgstr ""
-"The name you chose is already used.\n"
-"Please change the source name."
-
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:563
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:615
-msgid "Name is Not Unique"
-msgstr "Name is Not Unique"
+#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:71
+msgid "Copyright 2000-2001 by Andrea Rizzi"
+msgstr "Copyright 2000-2001 by Andrea Rizzi"
 
 #: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:102
 #, c-format
@@ -6070,10 +4939,6 @@ msgstr "Scanning file: %1"
 msgid "Entries added: %1"
 msgstr "Entries added: %1"
 
-#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:71
-msgid "Copyright 2000-2001 by Andrea Rizzi"
-msgstr "Copyright 2000-2001 by Andrea Rizzi"
-
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:84
 msgid "No error"
 msgstr "No error"
@@ -6092,15 +4957,22 @@ msgstr ""
 msgid "Create Folder"
 msgstr "Create Folder"
 
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Do Not Create"
+msgstr "Do Not Create"
+
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:146
 #, c-format
 msgid "It was not possible to create folder %1"
 msgstr "It was not possible to create folder %1"
 
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:176
+#, fuzzy
 msgid ""
 "<p>There are backup database files from previous versions of KBabel. However, "
-"another version of KBabel (probably from TDE 3.1.1 or 3.1.2) created a new "
+"another version of KBabel (probably from KDE 3.1.1 or 3.1.2) created a new "
 "database. As a result, your KBabel installation contains two versions of "
 "database files. Unfortunatelly, the old and new version can not be merged. You "
 "need to choose one of them."
@@ -6141,6 +5013,11 @@ msgstr ""
 "Database files not found.\n"
 "Do you want to create them now?"
 
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Create"
+msgstr "Create"
+
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:408
 msgid "Cannot open the database"
 msgstr "Cannot open the database"
@@ -6219,51 +5096,61 @@ msgstr "Searching words"
 msgid "Process output"
 msgstr "Process output"
 
-#: kbabeldict/modules/poauxiliary/pa_factory.cpp:95
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:147
-msgid "PO Auxiliary"
-msgstr "PO Auxiliary"
-
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:426
-msgid "Loading PO auxiliary"
-msgstr "Loading PO auxiliary"
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:72
+msgid "Copyright 2000-2003 by Andrea Rizzi"
+msgstr "Copyright 2000-2003 by Andrea Rizzi"
 
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:438
-#, c-format
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:562
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:614
 msgid ""
-"Error while trying to open file for PO Auxiliary module:\n"
-"%1"
+"The name you chose is already used.\n"
+"Please change the source name."
 msgstr ""
-"Error while trying to open file for PO Auxiliary module:\n"
-"%1"
-
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:450
-msgid "Building index"
-msgstr "Building index"
+"The name you chose is already used.\n"
+"Please change the source name."
 
-#: kbabeldict/modules/poauxiliary/pa_factory.cpp:97
-msgid "A simple module for exact searching in a PO file"
-msgstr "A simple module for exact searching in a PO file"
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:563
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:615
+msgid "Name is Not Unique"
+msgstr "Name is Not Unique"
 
-#: kbabeldict/kbabeldictview.cpp:83
-msgid "Search in module:"
-msgstr "Search in module:"
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Create Database"
+msgstr "Create Database"
 
-#: kbabeldict/kbabeldictview.cpp:106
-msgid "&Start Search"
-msgstr "&Start Search"
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:182
+msgid "CHUNK BY CHUNK"
+msgstr "CHUNK BY CHUNK"
 
-#: kbabeldict/kbabeldictview.cpp:108
-msgid "Sea&rch in translations"
-msgstr "Sea&rch in translations"
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:183
+msgid ""
+"<h3>Chunk by chunk</h3>CHANGE THIS TEXT!!!!This translation isobtained "
+"translating the  sentences and using afuzzy sentence translation database."
+"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
+"<br>"
+msgstr ""
+"<h3>Chunk by chunk</h3>CHANGE THIS TEXT!!!!This translation isobtained "
+"translating the  sentences and using a fuzzy sentence translation database."
+"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
+"<br>"
 
-#: kbabeldict/kbabeldictview.cpp:125
-msgid "Settings:"
-msgstr "Settings:"
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:374
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:386
+msgid "DYNAMIC DICT:"
+msgstr "DYNAMIC DICT:"
 
-#: kbabeldict/aboutmoduledlg.cpp:42
-msgid "Report Bug..."
-msgstr "Report Bug..."
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:375
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:387
+msgid ""
+"<h3>Dynamic Dictionary</h3>This is a dynamic dictionary created looking for "
+"correlation of original and translated words."
+"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
+"<br>"
+msgstr ""
+"<h3>Dynamic Dictionary</h3>This is a dynamic dictionary created looking for "
+"correlation of original and translated words."
+"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
+"<br>"
 
 #: kbabeldict/kbabeldict.cpp:45
 msgid "KBabelDict"
@@ -6281,6 +5168,104 @@ msgstr "Hide Sett&ings"
 msgid "Show Sett&ings"
 msgstr "Show Sett&ings"
 
+#: kbabeldict/kbabeldictbox.cpp:201
+msgid "Total:"
+msgstr "Total:"
+
+#: kbabeldict/kbabeldictbox.cpp:216
+msgid "Found in:"
+msgstr "Found in:"
+
+#: kbabeldict/kbabeldictbox.cpp:224
+msgid "Translator:"
+msgstr "Translator:"
+
+#: kbabeldict/kbabeldictbox.cpp:236
+msgid "Date:"
+msgstr "Date:"
+
+#: kbabeldict/kbabeldictbox.cpp:244
+msgid "&More"
+msgstr "&More"
+
+#: kbabeldict/kbabeldictbox.cpp:287
+msgid "Score"
+msgstr "Score"
+
+#: kbabeldict/kbabeldictbox.cpp:288
+msgid "Original"
+msgstr "Original"
+
+#: kbabeldict/kbabeldictbox.cpp:289
+msgid "Translation"
+msgstr "Translation"
+
+#: kbabeldict/kbabeldictbox.cpp:290
+msgid "Location"
+msgstr "Location"
+
+#: kbabeldict/kbabeldictbox.cpp:313
+msgid "< &Previous"
+msgstr "< &Previous"
+
+#: kbabeldict/kbabeldictbox.cpp:318
+msgid "&Next >"
+msgstr "&Next >"
+
+#: kbabeldict/kbabeldictbox.cpp:957 kbabeldict/kbabeldictbox.cpp:1015
+#: kbabeldict/kbabeldictbox.cpp:1027 kbabeldict/kbabeldictbox.cpp:1128
+#: kbabeldict/kbabeldictbox.cpp:1190 kbabeldict/kbabeldictbox.cpp:1449
+msgid "Edit File"
+msgstr "Edit File"
+
+#: kbabeldict/kbabeldictbox.cpp:1010 kbabeldict/kbabeldictbox.cpp:1185
+#, c-format
+msgid "Edit File %1"
+msgstr "Edit File %1"
+
+#: kbabeldict/kbabeldictbox.cpp:1257
+#, c-format
+msgid "Send bugs to %1"
+msgstr "Send bugs to %1"
+
+#: kbabeldict/kbabeldictbox.cpp:1270
+msgid "Authors:"
+msgstr "Authors:"
+
+#: kbabeldict/kbabeldictbox.cpp:1286
+msgid "Thanks to:"
+msgstr "Thanks to:"
+
+#: kbabeldict/kbabeldictbox.cpp:1302
+msgid "No information available."
+msgstr "No information available."
+
+#: kbabeldict/kbabeldictbox.cpp:1505
+#, c-format
+msgid "Configure Dictionary %1"
+msgstr "Configure Dictionary %1"
+
+#: kbabeldict/kbabeldictbox.cpp:1698
+#, c-format
+msgid ""
+"There was an error starting KBabel:\n"
+"%1"
+msgstr ""
+"There was an error starting KBabel:\n"
+"%1"
+
+#: kbabeldict/kbabeldictbox.cpp:1712
+msgid "There was an error using DCOP."
+msgstr "There was an error using DCOP."
+
+#: kbabeldict/kbabeldictbox.cpp:1738
+msgid ""
+"The \"Translation Database\" module\n"
+"appears not to be installed on your system."
+msgstr ""
+"The \"Translation Database\" module\n"
+"appears not to be installed on your system."
+
 #: kbabeldict/dictchooser.cpp:59
 msgid ""
 "_: dictionary to not use\n"
@@ -6305,6 +5290,1029 @@ msgstr "Move &Down"
 msgid "Con&figure..."
 msgstr "Con&figure..."
 
+#: kbabeldict/main.cpp:114
+msgid "KBabel - Dictionary"
+msgstr "KBabel - Dictionary"
+
+#: kbabeldict/main.cpp:115
+msgid "A dictionary for translators"
+msgstr "A dictionary for translators"
+
+#: kbabeldict/main.cpp:116
+msgid "(c) 2000,2001,2002,2003 The KBabeldict developers"
+msgstr "(c) 2000,2001,2002,2003 The KBabeldict developers"
+
+#: common/catalog.cpp:592
+msgid ""
+"Free Software Foundation Copyright does not contain any year. It will not be "
+"updated."
+msgstr ""
+"Free Software Foundation Copyright does not contain any year. It will not be "
+"updated."
+
+#: common/catalog.cpp:1237
+msgid "validating file"
+msgstr "validating file"
+
+#: common/catalog.cpp:1276
+msgid "applying tool"
+msgstr "applying tool"
+
+#: common/catalog.cpp:3128
+msgid "searching matching message"
+msgstr "searching matching message"
+
+#: common/catalog.cpp:3217
+msgid "preparing messages for diff"
+msgstr "preparing messages for diff"
+
+#: common/kbproject.cpp:53
+msgid "unnamed"
+msgstr "unnamed"
+
+#: common/kbmailer.cpp:106
+#, c-format
+msgid "Error while trying to download file %1."
+msgstr "Error while trying to download file %1."
+
+#: common/kbmailer.cpp:145
+msgid "Enter the name of the archive without file extension"
+msgstr "Enter the name of the archive without file extension"
+
+#: common/kbmailer.cpp:178
+msgid "Error while trying to create archive file."
+msgstr "Error while trying to create archive file."
+
+#: common/kbmailer.cpp:193
+#, c-format
+msgid "Error while trying to read file %1."
+msgstr "Error while trying to read file %1."
+
+#: common/kbmailer.cpp:208
+msgid "Error while trying to copy file %1 into archive."
+msgstr "Error while trying to copy file %1 into archive."
+
+#: filters/gettext/gettextexport.cpp:74
+msgid "saving file"
+msgstr "saving file"
+
+#: filters/gettext/gettextimport.cpp:83
+msgid "loading file"
+msgstr "loading file"
+
+#: catalogmanager/validateprogress.cpp:56
+msgid ""
+"_: Caption of dialog\n"
+"Validation"
+msgstr "Validation"
+
+#: catalogmanager/catalogmanager.cpp:222
+#: catalogmanager/validateprogress.cpp:72
+msgid "&Open"
+msgstr "&Open"
+
+#: catalogmanager/validateprogress.cpp:73
+msgid "&Ignore"
+msgstr "&Ignore"
+
+#: catalogmanager/catalogmanagerview.cpp:2999
+#: catalogmanager/validateprogress.cpp:98
+msgid ""
+"Cannot instantiate a validation tool.\n"
+"Please check your installation."
+msgstr ""
+"Cannot instantiate a validation tool.\n"
+"Please check your installation."
+
+#: catalogmanager/catalogmanagerview.cpp:3000
+#: catalogmanager/validateprogress.cpp:99
+msgid "Validation Tool Error"
+msgstr "Validation Tool Error"
+
+#: catalogmanager/validateprogress.cpp:186
+msgid ""
+"Validation done.\n"
+"\n"
+"Checked files: %1\n"
+"Number of errors: %2\n"
+"Number of ignored errors: %3"
+msgstr ""
+"Validation done.\n"
+"\n"
+"Checked files: %1\n"
+"Number of errors: %2\n"
+"Number of ignored errors: %3"
+
+#: catalogmanager/validateprogress.cpp:190
+msgid "Validation Done"
+msgstr "Validation Done"
+
+#: catalogmanager/multiroughtransdlg.cpp:56
+msgid "Files:"
+msgstr "Files:"
+
+#: catalogmanager/catalogmanagerview.cpp:94 catalogmanager/future.cpp:5
+msgid "CVS/SVN Status"
+msgstr "CVS/SVN Status"
+
+#: catalogmanager/future.cpp:8
+msgid "Resolved"
+msgstr "Resolved"
+
+#: catalogmanager/future.cpp:9
+msgid "Resolved for Marked"
+msgstr "Resolved for Marked"
+
+#: catalogmanager/future.cpp:10
+msgid "Revert"
+msgstr "Revert"
+
+#: catalogmanager/future.cpp:11
+msgid "Revert for Marked"
+msgstr "Revert for Marked"
+
+#: catalogmanager/future.cpp:12
+msgid "Cleanup"
+msgstr "Cleanup"
+
+#: catalogmanager/future.cpp:13
+msgid "Cleanup for Marked"
+msgstr "Cleanup for Marked"
+
+#: catalogmanager/future.cpp:16
+msgid "No repository"
+msgstr "No repository"
+
+#: catalogmanager/catmanlistitem.cpp:80
+msgid "Message Catalogs"
+msgstr "Message Catalogues"
+
+#: catalogmanager/catmanlistitem.cpp:450 catalogmanager/catmanlistitem.cpp:637
+msgid "No version control"
+msgstr "No version control"
+
+#: catalogmanager/libcvs/cvshandler.cpp:88
+msgid "No CVS repository"
+msgstr "No CVS repository"
+
+#: catalogmanager/libcvs/cvshandler.cpp:91
+msgid "Not in CVS"
+msgstr "Not in CVS"
+
+#: catalogmanager/libcvs/cvshandler.cpp:94
+#: catalogmanager/libsvn/svnhandler.cpp:96
+msgid "Locally added"
+msgstr "Locally added"
+
+#: catalogmanager/libcvs/cvshandler.cpp:97
+#: catalogmanager/libsvn/svnhandler.cpp:99
+msgid "Locally removed"
+msgstr "Locally removed"
+
+#: catalogmanager/libcvs/cvshandler.cpp:100
+#: catalogmanager/libsvn/svnhandler.cpp:102
+msgid "Locally modified"
+msgstr "Locally modified"
+
+#: catalogmanager/libcvs/cvshandler.cpp:103
+#: catalogmanager/libsvn/svnhandler.cpp:105
+msgid "Up-to-date"
+msgstr "Up-to-date"
+
+#: catalogmanager/libcvs/cvshandler.cpp:106
+#: catalogmanager/libsvn/svnhandler.cpp:108
+msgid "Conflict"
+msgstr "Conflict"
+
+#: catalogmanager/libcvs/cvshandler.cpp:109
+#: catalogmanager/libsvn/svnhandler.cpp:113
+msgid "Unknown"
+msgstr "Unknown"
+
+#: catalogmanager/libcvs/cvshandler.cpp:189
+#: catalogmanager/libcvs/cvshandler.cpp:228
+msgid ""
+"This is not a valid CVS repository. The CVS commands cannot be executed."
+msgstr ""
+"This is not a valid CVS repository. The CVS commands cannot be executed."
+
+#: catalogmanager/libcvs/cvsdialog.cpp:311
+#: catalogmanager/libcvs/cvshandler.cpp:375
+#: catalogmanager/libsvn/svndialog.cpp:290
+#: catalogmanager/libsvn/svnhandler.cpp:483
+msgid "[ Starting command ]"
+msgstr "[ Starting command ]"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:68
+msgid "CVS Dialog"
+msgstr "CVS Dialogue"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:77
+#: catalogmanager/libsvn/svndialog.cpp:74
+msgid "Update the following files:"
+msgstr "Update the following files:"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:80
+#: catalogmanager/libsvn/svndialog.cpp:77
+msgid "Commit the following files:"
+msgstr "Commit the following files:"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:83
+msgid "Get status for the following files:"
+msgstr "Get status for the following files:"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:86
+#: catalogmanager/libsvn/svndialog.cpp:86
+msgid "Get diff for the following files:"
+msgstr "Get diff for the following files:"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:100
+#: catalogmanager/libsvn/svndialog.cpp:103
+msgid "&Old messages:"
+msgstr "&Old messages:"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:108
+#: catalogmanager/libsvn/svndialog.cpp:111
+msgid "&Log message:"
+msgstr "&Log message:"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:114
+msgid "E&ncoding:"
+msgstr "E&ncoding:"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:121
+msgid ""
+"_: Descriptive encoding name\n"
+"Recommended ( %1 )"
+msgstr "Recommended (%1)"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:122
+msgid ""
+"_: Descriptive encoding name\n"
+"Locale ( %1 )"
+msgstr "Locale (%1)"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:133
+#: catalogmanager/libsvn/svndialog.cpp:124
+msgid "Auto&matically add files if necessary"
+msgstr "Auto&matically add files if necessary"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:144
+#: catalogmanager/libsvn/svndialog.cpp:135
+msgid "&Commit"
+msgstr "&Commit"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:147
+#: catalogmanager/libsvn/svndialog.cpp:139
+msgid "&Get Status"
+msgstr "&Get Status"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:150
+#: catalogmanager/libsvn/svndialog.cpp:142
+msgid "&Get Diff"
+msgstr "&Get Diff"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:165
+#: catalogmanager/libsvn/svndialog.cpp:160
+msgid "Command output:"
+msgstr "Command output:"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:237
+#: catalogmanager/libsvn/svndialog.cpp:233
+msgid "The commit log message is empty. Do you want to continue?"
+msgstr "The commit log message is empty. Do you want to continue?"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:247
+#, c-format
+msgid "Cannot find encoding: %1"
+msgstr "Cannot find encoding: %1"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:253
+msgid ""
+"The commit log message cannot be encoded in the selected encoding: %1.\n"
+"Do you want to continue?"
+msgstr ""
+"The commit log message cannot be encoded in the selected encoding: %1.\n"
+"Do you want to continue?"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:268
+#: catalogmanager/libsvn/svndialog.cpp:247
+msgid "Cannot open temporary file for writing. Aborting."
+msgstr "Cannot open temporary file for writing. Aborting."
+
+#: catalogmanager/libcvs/cvsdialog.cpp:280
+#: catalogmanager/libsvn/svndialog.cpp:259
+msgid "Cannot write to temporary file. Aborting."
+msgstr "Cannot write to temporary file. Aborting."
+
+#: catalogmanager/libcvs/cvsdialog.cpp:322
+#: catalogmanager/libsvn/svndialog.cpp:301
+msgid "The process could not be started."
+msgstr "The process could not be started."
+
+#: catalogmanager/libcvs/cvsdialog.cpp:351
+#: catalogmanager/libsvn/svndialog.cpp:330
+msgid "[ Exited with status %1 ]"
+msgstr "[ Exited with status %1 ]"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:353
+#: catalogmanager/libsvn/svndialog.cpp:332
+msgid "[ Finished ]"
+msgstr "[ Finished ]"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:401
+msgid ""
+"_: Descriptive encoding name\n"
+"Last choice ( %1 )"
+msgstr "Last choice (%1)"
+
+#: catalogmanager/catalogmanagerview.cpp:89
+msgid "Name"
+msgstr "Name"
+
+#: catalogmanager/catalogmanagerview.cpp:90
+msgid "M"
+msgstr "M"
+
+#: catalogmanager/catalogmanagerview.cpp:91
+msgid "Fuzzy"
+msgstr "Fuzzy"
+
+#: catalogmanager/catalogmanagerview.cpp:92
+msgid "Untranslated"
+msgstr "Untranslated"
+
+#: catalogmanager/catalogmanagerview.cpp:93
+msgid "Total"
+msgstr "Total"
+
+#: catalogmanager/catalogmanagerview.cpp:95
+msgid "Last Revision"
+msgstr "Last Revision"
+
+#: catalogmanager/catalogmanagerview.cpp:178
+#: catalogmanager/catalogmanagerview.cpp:2447
+#: catalogmanager/catalogmanagerview.cpp:2458
+msgid "Log Window"
+msgstr "Log Window"
+
+#: catalogmanager/catalogmanagerview.cpp:180
+msgid "C&lear"
+msgstr "C&lear"
+
+#: catalogmanager/catalogmanagerview.cpp:183
+msgid ""
+"<qt>"
+"<p><b>Log window</b></p>\n"
+"<p>In this window the output of the executed commands are shown.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Log window</b></p>\n"
+"<p>In this window the output of the executed commands are shown.</p></qt>"
+
+#: catalogmanager/catalogmanagerview.cpp:194
+msgid ""
+"<qt>"
+"<p><b>Catalog Manager</b></p>\n"
+"<p>The Catalog Manager merges two folders into one tree and displays all\n"
+"PO and POT files in these folders. This way you can easily see if a\n"
+"template has been added or removed. Also some information about the files\n"
+"is displayed.</p>"
+"<p>For more information see section <b>The Catalog Manager</b> "
+"in the online help.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Catalogue Manager</b></p>\n"
+"<p>The Catalogue Manager merges two folders into one tree and displays all\n"
+"PO and POT files in these folders. This way you can easily see if a\n"
+"new template has been added or removed. Also some information about the files\n"
+"is displayed.</p>"
+"<p>For more information see section <b>The Catalogue Manager</b> "
+"in the online help.</p></qt>"
+
+#: catalogmanager/catalogmanagerview.cpp:473
+msgid ""
+"Error while trying to read file:\n"
+" %1\n"
+"Maybe it is not a valid file with list of markings."
+msgstr ""
+"Error while trying to read file:\n"
+" %1\n"
+"Maybe it is not a valid file with list of markings."
+
+#: catalogmanager/catalogmanagerview.cpp:571
+msgid ""
+"An error occurred while trying to write to file:\n"
+"%1\n"
+msgstr ""
+"An error occurred while trying to write to file:\n"
+"%1\n"
+
+#: catalogmanager/catalogmanagerview.cpp:580
+msgid ""
+"An error occurred while trying to upload the file:\n"
+"%1\n"
+msgstr ""
+"An error occurred while trying to upload the file:\n"
+"%1\n"
+
+#: catalogmanager/catalogmanagerview.cpp:664
+#: catalogmanager/catalogmanagerview.cpp:691
+msgid ""
+"The Catalog Manager is still updating information about the files.\n"
+"If you continue, it will try to update all necessary files, however this can "
+"take a long time and may lead to wrong results. Please wait until all files are "
+"updated."
+msgstr ""
+"The Catalogue Manager is still updating information about the files.\n"
+"If you continue, it will try to update all necessary files, however this can "
+"take a long time and may lead to wrong results. Please wait until all files are "
+"updated."
+
+#: catalogmanager/catalogmanagerview.cpp:769
+msgid ""
+"Statistics for all:\n"
+msgstr ""
+"Statistics for all:\n"
+
+#: catalogmanager/catalogmanagerview.cpp:771
+msgid ""
+"Statistics for %1:\n"
+msgstr ""
+"Statistics for %1:\n"
+
+#: catalogmanager/catalogmanagerview.cpp:773
+msgid ""
+"Number of packages: %1\n"
+msgstr ""
+"Number of packages: %1\n"
+
+#: catalogmanager/catalogmanagerview.cpp:776
+msgid ""
+"Complete translated: %1 % (%2)\n"
+msgstr ""
+"Complete translated: %1 % (%2)\n"
+
+#: catalogmanager/catalogmanagerview.cpp:779
+msgid ""
+"Only template available: %1 % (%2)\n"
+msgstr ""
+"Only template available: %1 % (%2)\n"
+
+#: catalogmanager/catalogmanagerview.cpp:781
+msgid ""
+"Only PO file available: %1 % (%2)\n"
+msgstr ""
+"Only PO file available: %1 % (%2)\n"
+
+#: catalogmanager/catalogmanagerview.cpp:783
+msgid ""
+"Number of messages: %1\n"
+msgstr ""
+"Number of messages: %1\n"
+
+#: catalogmanager/catalogmanagerview.cpp:787
+msgid ""
+"Translated: %1 % (%2)\n"
+msgstr ""
+"Translated: %1 % (%2)\n"
+
+#: catalogmanager/catalogmanagerview.cpp:790
+msgid ""
+"Fuzzy: %1 % (%2)\n"
+msgstr ""
+"Fuzzy: %1 % (%2)\n"
+
+#: catalogmanager/catalogmanagerview.cpp:793
+msgid ""
+"Untranslated: %1 % (%2)\n"
+msgstr ""
+"Untranslated: %1 % (%2)\n"
+
+#: catalogmanager/catalogmanagerview.cpp:820
+msgid ""
+"The file is syntactically correct.\n"
+"Output of \"msgfmt --statistics\":"
+msgstr ""
+"The file is syntactically correct.\n"
+"Output of \"msgfmt --statistics\":"
+
+#: catalogmanager/catalogmanagerview.cpp:825
+msgid ""
+"The file has syntax errors.\n"
+"Output of \"msgfmt --statistics\":"
+msgstr ""
+"The file has syntax errors.\n"
+"Output of \"msgfmt --statistics\":"
+
+#: catalogmanager/catalogmanagerview.cpp:830
+msgid ""
+"The file has header syntax error.\n"
+"Output of \"msgfmt --statistics\":"
+msgstr ""
+"The file has header syntax error.\n"
+"Output of \"msgfmt --statistics\":"
+
+#: catalogmanager/catalogmanagerview.cpp:835
+msgid "An error occurred while processing \"msgfmt --statistics\""
+msgstr "An error occurred while processing \"msgfmt --statistics\""
+
+#: catalogmanager/catalogmanagerview.cpp:840
+#: catalogmanager/catalogmanagerview.cpp:929
+msgid ""
+"Cannot execute msgfmt. Please make sure that you have msgfmt in your PATH."
+msgstr ""
+"Cannot execute msgfmt. Please make sure that you have msgfmt in your PATH."
+
+#: catalogmanager/catalogmanagerview.cpp:868
+msgid ""
+"All files in folder %1 are syntactically correct.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+"All files in folder %1 are syntactically correct.\n"
+"Output of \"msgfmt --statistics\":\n"
+
+#: catalogmanager/catalogmanagerview.cpp:873
+msgid ""
+"All files in the base folder are syntactically correct.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+"All files in the base folder are syntactically correct.\n"
+"Output of \"msgfmt --statistics\":\n"
+
+#: catalogmanager/catalogmanagerview.cpp:884
+msgid ""
+"At least one file in folder %1 has syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+"At least one file in folder %1 has syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+
+#: catalogmanager/catalogmanagerview.cpp:889
+msgid ""
+"At least one file in the base folder has syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+"At least one file in the base folder has syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+
+#: catalogmanager/catalogmanagerview.cpp:900
+msgid ""
+"At least one file in folder %1 has header syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+"At least one file in folder %1 has header syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+
+#: catalogmanager/catalogmanagerview.cpp:905
+msgid ""
+"At least one file in the base folder has header syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+"At least one file in the base folder has header syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+
+#: catalogmanager/catalogmanagerview.cpp:916
+#, c-format
+msgid ""
+"An error occurred while processing \"msgfmt --statistics *.po\" in folder %1"
+msgstr ""
+"An error occurred while processing \"msgfmt --statistics *.po\" in folder %1"
+
+#: catalogmanager/catalogmanagerview.cpp:921
+msgid ""
+"An error occurred while processing \"msgfmt --statistics *.po\" in the base "
+"folder"
+msgstr ""
+"An error occurred while processing \"msgfmt --statistics *.po\" in the base "
+"folder"
+
+#: catalogmanager/catalogmanagerview.cpp:1502
+msgid "Do you really want to delete the file %1?"
+msgstr "Do you really want to delete the file %1?"
+
+#: catalogmanager/catalogmanagerview.cpp:1507
+msgid "Was not able to delete the file %1!"
+msgstr "Was not able to delete the file %1!"
+
+#: catalogmanager/catalogmanagerview.cpp:1766
+msgid ""
+"You have not specified a valid folder for the base folder of the PO files:\n"
+"%1\n"
+"Please check your settings in the project settings dialog."
+msgstr ""
+"You have not specified a valid folder for the base folder of the PO files:\n"
+"%1\n"
+"Please check your settings in the project settings dialogue."
+
+#: catalogmanager/catalogmanagerview.cpp:1783
+msgid ""
+"You have not specified a valid folder for the base folder of the PO template "
+"files:\n"
+"%1\n"
+"Please check your settings in the project settings dialog."
+msgstr ""
+"You have not specified a valid folder for the base folder of the PO template "
+"files:\n"
+"%1\n"
+"Please check your settings in the project settings dialogue."
+
+#: catalogmanager/catalogmanagerview.cpp:1824
+msgid "Reading file information"
+msgstr "Reading file information"
+
+#: catalogmanager/catalogmanagerview.cpp:3008
+msgid "Validation Options"
+msgstr "Validation Options"
+
+#: catalogmanager/markpatterndialog.cpp:113
+msgid "Ma&rk files which match the following pattern:"
+msgstr "Ma&rk files which match the following pattern:"
+
+#: catalogmanager/markpatterndialog.cpp:114
+msgid "&Mark Files"
+msgstr "&Mark Files"
+
+#: catalogmanager/markpatterndialog.cpp:116
+msgid "Unma&rk files which match the following pattern:"
+msgstr "Unma&rk files which match the following pattern:"
+
+#: catalogmanager/markpatterndialog.cpp:117
+msgid "Un&mark Files"
+msgstr "Un&mark Files"
+
+#: catalogmanager/findinfilesdialog.cpp:50
+msgid "File Options"
+msgstr "File Options"
+
+#: catalogmanager/findinfilesdialog.cpp:53
+msgid "&In all files"
+msgstr "&In all files"
+
+#: catalogmanager/findinfilesdialog.cpp:54
+msgid "&Marked files"
+msgstr "&Marked files"
+
+#: catalogmanager/findinfilesdialog.cpp:55
+msgid "In &templates"
+msgstr "In &templates"
+
+#: catalogmanager/findinfilesdialog.cpp:56
+msgid "Ask before ne&xt file"
+msgstr "Ask before ne&xt file"
+
+#: catalogmanager/findinfilesdialog.cpp:57
+msgid "Save &without asking"
+msgstr "Save &without asking"
+
+#: catalogmanager/findinfilesdialog.cpp:59
+msgid ""
+"<qt>"
+"<p><b>File Options</b></p>"
+"<p>Here you can finetune where to find:"
+"<ul>"
+"<li><b>In all files</b>: search in all files, otherwise searched is the "
+"selected file or files in the selected folder</li>"
+"<li><b>Ask before next file</b>: show a dialog asking to proceed to the next "
+"file</li></ul></qt>"
+msgstr ""
+"<qt>"
+"<p><b>File Options</b></p>"
+"<p>Here you can finetune where to find:"
+"<ul>"
+"<li><b>In all files</b>: search in all files, otherwise searched is the "
+"selected file or files in the selected folder</li>"
+"<li><b>Ask before next file</b>: show a dialogue asking to proceed to the next "
+"file</li></ul></qt>"
+
+#: catalogmanager/libsvn/svnhandler.cpp:90
+msgid "No SVN repository"
+msgstr "No SVN repository"
+
+#: catalogmanager/libsvn/svnhandler.cpp:93
+msgid "Not in SVN"
+msgstr "Not in SVN"
+
+#: catalogmanager/libsvn/svnhandler.cpp:111
+msgid "Error in Working Copy"
+msgstr "Error in Working Copy"
+
+#: catalogmanager/libsvn/svnhandler.cpp:288
+msgid ""
+"This is not a valid SVN repository. The SVN commands cannot be executed."
+msgstr ""
+"This is not a valid SVN repository. The SVN commands cannot be executed."
+
+#: catalogmanager/libsvn/svndialog.cpp:65
+msgid "SVN Dialog"
+msgstr "SVN Dialogue"
+
+#: catalogmanager/libsvn/svndialog.cpp:80
+msgid "Get remote status for the following files:"
+msgstr "Get remote status for the following files:"
+
+#: catalogmanager/libsvn/svndialog.cpp:83
+msgid "Get local status for the following files:"
+msgstr "Get local status for the following files:"
+
+#: catalogmanager/libsvn/svndialog.cpp:89
+msgid "Get information for the following files:"
+msgstr "Get information for the following files:"
+
+#: catalogmanager/libsvn/svndialog.cpp:145
+msgid "&Get Information"
+msgstr "&Get Information"
+
+#: catalogmanager/catalogmanager.cpp:225
+msgid "&Open Template"
+msgstr "&Open Template"
+
+#: catalogmanager/catalogmanager.cpp:228
+msgid "Open in &New Window"
+msgstr "Open in &New Window"
+
+#: catalogmanager/catalogmanager.cpp:237
+msgid "Fi&nd in Files..."
+msgstr "Fi&nd in Files..."
+
+#: catalogmanager/catalogmanager.cpp:240
+msgid "Re&place in Files..."
+msgstr "Re&place in Files..."
+
+#: catalogmanager/catalogmanager.cpp:251
+msgid "&Toggle Marking"
+msgstr "&Toggle Marking"
+
+#: catalogmanager/catalogmanager.cpp:254
+msgid "Remove Marking"
+msgstr "Remove Marking"
+
+#: catalogmanager/catalogmanager.cpp:257
+msgid "Toggle All Markings"
+msgstr "Toggle All Markings"
+
+#: catalogmanager/catalogmanager.cpp:260
+msgid "Remove All Markings"
+msgstr "Remove All Markings"
+
+#: catalogmanager/catalogmanager.cpp:263
+msgid "Mark Modified Files"
+msgstr "Mark Modified Files"
+
+#: catalogmanager/catalogmanager.cpp:267
+msgid "&Load Markings..."
+msgstr "&Load Markings..."
+
+#: catalogmanager/catalogmanager.cpp:270
+msgid "&Save Markings..."
+msgstr "&Save Markings..."
+
+#: catalogmanager/catalogmanager.cpp:273
+msgid "&Mark Files..."
+msgstr "&Mark Files..."
+
+#: catalogmanager/catalogmanager.cpp:275
+msgid "&Unmark Files..."
+msgstr "&Unmark Files..."
+
+#: catalogmanager/catalogmanager.cpp:309
+msgid "Next Te&mplate Only"
+msgstr "Next Te&mplate Only"
+
+#: catalogmanager/catalogmanager.cpp:312
+msgid "Previous Temp&late Only"
+msgstr "Previous Temp&late Only"
+
+#: catalogmanager/catalogmanager.cpp:315
+msgid "Next Tran&slation Exists"
+msgstr "Next Tran&slation Exists"
+
+#: catalogmanager/catalogmanager.cpp:318
+msgid "Previous Transl&ation Exists"
+msgstr "Previous Transl&ation Exists"
+
+#: catalogmanager/catalogmanager.cpp:322
+msgid "Previous Marke&d"
+msgstr "Previous Marke&d"
+
+#: catalogmanager/catalogmanager.cpp:325
+msgid "Next &Marked"
+msgstr "Next &Marked"
+
+#: catalogmanager/catalogmanager.cpp:350
+msgid "&Statistics"
+msgstr "&Statistics"
+
+#: catalogmanager/catalogmanager.cpp:353
+msgid "S&tatistics in Marked"
+msgstr "S&tatistics in Marked"
+
+#: catalogmanager/catalogmanager.cpp:356
+msgid "Check S&yntax"
+msgstr "Check S&yntax"
+
+#: catalogmanager/catalogmanager.cpp:359
+msgid "S&pell Check"
+msgstr "S&pell Check"
+
+#: catalogmanager/catalogmanager.cpp:362
+msgid "Spell Check in &Marked"
+msgstr "Spell Check in &Marked"
+
+#: catalogmanager/catalogmanager.cpp:365
+msgid "&Rough Translation"
+msgstr "&Rough Translation"
+
+#: catalogmanager/catalogmanager.cpp:368
+msgid "Rough Translation in M&arked"
+msgstr "Rough Translation in M&arked"
+
+#: catalogmanager/catalogmanager.cpp:371
+msgid "Mai&l"
+msgstr "Mai&l"
+
+#: catalogmanager/catalogmanager.cpp:374
+msgid "Mail Mar&ked"
+msgstr "Mail Mar&ked"
+
+#: catalogmanager/catalogmanager.cpp:378
+msgid "&Pack"
+msgstr "&Pack"
+
+#: catalogmanager/catalogmanager.cpp:380
+msgid "Pack &Marked"
+msgstr "Pack &Marked"
+
+#: catalogmanager/catalogmanager.cpp:412
+msgid "V&alidation Marked"
+msgstr "V&alidation Marked"
+
+#: catalogmanager/catalogmanager.cpp:425 catalogmanager/catalogmanager.cpp:451
+msgid "Update"
+msgstr "Update"
+
+#: catalogmanager/catalogmanager.cpp:427 catalogmanager/catalogmanager.cpp:453
+msgid "Update Marked"
+msgstr "Update Marked"
+
+#: catalogmanager/catalogmanager.cpp:429 catalogmanager/catalogmanager.cpp:455
+msgid "Commit"
+msgstr "Commit"
+
+#: catalogmanager/catalogmanager.cpp:431 catalogmanager/catalogmanager.cpp:457
+msgid "Commit Marked"
+msgstr "Commit Marked"
+
+#: catalogmanager/catalogmanager.cpp:433
+msgid "Status"
+msgstr "Status"
+
+#: catalogmanager/catalogmanager.cpp:435
+msgid "Status for Marked"
+msgstr "Status for Marked"
+
+#: catalogmanager/catalogmanager.cpp:437 catalogmanager/catalogmanager.cpp:467
+msgid "Show Diff"
+msgstr "Show Diff"
+
+#: catalogmanager/catalogmanager.cpp:459
+msgid "Status (Local)"
+msgstr "Status (Local)"
+
+#: catalogmanager/catalogmanager.cpp:461
+msgid "Status (Local) for Marked"
+msgstr "Status (Local) for Marked"
+
+#: catalogmanager/catalogmanager.cpp:463
+msgid "Status (Remote)"
+msgstr "Status (Remote)"
+
+#: catalogmanager/catalogmanager.cpp:465
+msgid "Status (Remote) for Marked"
+msgstr "Status (Remote) for Marked"
+
+#: catalogmanager/catalogmanager.cpp:469
+msgid "Show Information"
+msgstr "Show Information"
+
+#: catalogmanager/catalogmanager.cpp:471
+msgid "Show Information for Marked"
+msgstr "Show Information for Marked"
+
+#: catalogmanager/catalogmanager.cpp:488 catalogmanager/catalogmanager.cpp:503
+msgid "Update Templates"
+msgstr "Update Templates"
+
+#: catalogmanager/catalogmanager.cpp:490 catalogmanager/catalogmanager.cpp:505
+msgid "Update Marked Templates"
+msgstr "Update Marked Templates"
+
+#: catalogmanager/catalogmanager.cpp:492 catalogmanager/catalogmanager.cpp:507
+msgid "Commit Templates"
+msgstr "Commit Templates"
+
+#: catalogmanager/catalogmanager.cpp:494 catalogmanager/catalogmanager.cpp:509
+msgid "Commit Marked Templates"
+msgstr "Commit Marked Templates"
+
+#: catalogmanager/catalogmanager.cpp:525 catalogmanager/catalogmanager.cpp:529
+msgid "Commands"
+msgstr "Commands"
+
+#: catalogmanager/catalogmanager.cpp:558
+msgid ""
+"<qt>"
+"<p><b>Statusbar</b></p>\n"
+"<p>The statusbar displays information about progress of the current find or "
+"replace operation. The first number in <b>Found:</b> "
+"displays the number of files with an occurrence of the searched text not yet "
+"shown in the KBabel window. The second shows the total number of files "
+"containing the searched text found so far.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Statusbar</b></p>\n"
+"<p>The statusbar displays information about progress of the current find or "
+"replace operation. The first number in <b>Found:</b> "
+"displays the number of files with an occurrence of the searched text not yet "
+"shown in the KBabel window. The second shows the total number of files "
+"containing the searched text found so far.</p></qt>"
+
+#: catalogmanager/catalogmanager.cpp:663 catalogmanager/catalogmanager.cpp:696
+#: catalogmanager/catalogmanager.cpp:727 catalogmanager/catalogmanager.cpp:757
+#: catalogmanager/catalogmanager.cpp:787 catalogmanager/catalogmanager.cpp:807
+#: catalogmanager/catalogmanager.cpp:827
+#, fuzzy
+msgid ""
+"Cannot send a message to KBabel.\n"
+"Please check your TDE installation."
+msgstr ""
+"Cannot send a message to KBabel.\n"
+"Please check your installation of TDE."
+
+#: catalogmanager/catalogmanager.cpp:858
+msgid ""
+"Unable to use TDELauncher to start KBabel.\n"
+"You should check the installation of TDE.\n"
+"Please start KBabel manually."
+msgstr ""
+"Unable to use TDELauncher to start KBabel.\n"
+"You should check the installation of TDE.\n"
+"Please start KBabel manually."
+
+#: catalogmanager/catalogmanager.cpp:893
+msgid "Found: 0/0"
+msgstr "Found: 0/0"
+
+#: catalogmanager/catalogmanager.cpp:915
+msgid "Found: %1/%2"
+msgstr "Found: %1/%2"
+
+#: catalogmanager/catalogmanager.cpp:986
+#: catalogmanager/catalogmanager.cpp:1073
+msgid "DCOP communication with KBabel failed."
+msgstr "DCOP communication with KBabel failed."
+
+#: catalogmanager/catalogmanager.cpp:986
+#: catalogmanager/catalogmanager.cpp:1073
+msgid "DCOP Communication Error"
+msgstr "DCOP Communication Error"
+
+#: catalogmanager/catalogmanager.cpp:1001
+#: catalogmanager/catalogmanager.cpp:1087
+msgid "KBabel cannot be started."
+msgstr "KBabel cannot be started."
+
+#: catalogmanager/catalogmanager.cpp:1001
+#: catalogmanager/catalogmanager.cpp:1087
+msgid "Cannot Start KBabel"
+msgstr "Cannot Start KBabel"
+
+#: catalogmanager/catalogmanager.cpp:1008
+#: catalogmanager/catalogmanager.cpp:1094
+msgid "Search string not found!"
+msgstr "Search string not found!"
+
+#: catalogmanager/catalogmanager.cpp:1235
+#, c-format
+msgid "Cannot open project file %1"
+msgstr "Cannot open project file %1"
+
+#: catalogmanager/main.cpp:186
+msgid "KBabel - Catalog Manager"
+msgstr "KBabel - Catalogue Manager"
+
+#: catalogmanager/main.cpp:187
+msgid "An advanced catalog manager for KBabel"
+msgstr "An advanced catalogue manager for KBabel"
+
+#: catalogmanager/main.cpp:211
+msgid "Support for making diffs and some minor improvements."
+msgstr "Support for making diffs and some minor improvements."
+
+#: catalogmanager/main.cpp:216
+msgid "KBabel contains code from GNU gettext"
+msgstr "KBabel contains code from GNU gettext"
+
 #~ msgid ""
 #~ "\n"
 #~ "There was also an error while reading the header.\n"
diff --git a/tde-i18n-en_GB/messages/tdesdk/kbugbuster.po b/tde-i18n-en_GB/messages/tdesdk/kbugbuster.po
index 21bda71fe10..67b6274bf90 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kbugbuster.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kbugbuster.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbugbuster\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-11-07 01:06+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -320,16 +321,16 @@ msgstr "My Bugs: %2"
 msgid "My Bugs"
 msgstr "My Bugs"
 
-#: backend/bugserver.cpp:289
+#: backend/bugserver.cpp:290
 msgid "Mail generated by KBugBuster"
 msgstr "Mail generated by KBugBuster"
 
-#: backend/bugserver.cpp:321
+#: backend/bugserver.cpp:322
 #, c-format
 msgid "Control command: %1"
 msgstr "Control command: %1"
 
-#: backend/bugserver.cpp:323
+#: backend/bugserver.cpp:324
 #, c-format
 msgid "Mail to %1"
 msgstr "Mail to %1"
@@ -339,7 +340,8 @@ msgid "Retrieving My Bugs list..."
 msgstr "Retrieving My Bugs list..."
 
 #: backend/kbbprefs.cpp:137
-msgid "Bug Fixed in CVS"
+#, fuzzy
+msgid "Bug Fixed in GIT"
 msgstr "Bug Fixed in CVS"
 
 #: backend/kbbprefs.cpp:140
@@ -351,7 +353,8 @@ msgid "Packaging Bug"
 msgstr "Packaging Bug"
 
 #: backend/kbbprefs.cpp:149
-msgid "Feature Implemented in CVS"
+#, fuzzy
+msgid "Feature Implemented in GIT"
 msgstr "Feature Implemented in CVS"
 
 #: backend/kbbprefs.cpp:152
@@ -812,15 +815,18 @@ msgid "&Recipient:"
 msgstr "&Recipient:"
 
 #: gui/msginputdialog.cpp:63
-msgid "Normal (bugs.kde.org & Maintainer & kde-bugs-dist)"
+#, fuzzy
+msgid "Normal (bugs.trinitydesktop.org & Maintainer & tde-bugs-dist)"
 msgstr "Normal (bugs.kde.org & Maintainer & kde-bugs-dist)"
 
 #: gui/msginputdialog.cpp:64
-msgid "Maintonly (bugs.kde.org & Maintainer)"
+#, fuzzy
+msgid "Maintonly (bugs.trinitydesktop.org & Maintainer)"
 msgstr "Maintonly (bugs.kde.org & Maintainer)"
 
 #: gui/msginputdialog.cpp:65
-msgid "Quiet (bugs.kde.org only)"
+#, fuzzy
+msgid "Quiet (bugs.trinitydesktop.org only)"
 msgstr "Quiet (bugs.kde.org only)"
 
 #: gui/msginputdialog.cpp:77
diff --git a/tde-i18n-en_GB/messages/tdesdk/kompare.po b/tde-i18n-en_GB/messages/tdesdk/kompare.po
index 62104118833..ad1bd4db145 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kompare.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kompare.po
@@ -7,15 +7,499 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kompare\n"
-"POT-Creation-Date: 2007-12-20 01:16+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-11-07 01:06+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "John Knight"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "anarchist_tomato@herzeleid.net"
+
+#: komparenavtreepart/komparenavtreepart.cpp:61
+msgid "Source Folder"
+msgstr "Source Folder"
+
+#: komparenavtreepart/komparenavtreepart.cpp:66
+msgid "Destination Folder"
+msgstr "Destination Folder"
+
+#: komparenavtreepart/komparenavtreepart.cpp:71
+msgid "Source File"
+msgstr "Source File"
+
+#: komparenavtreepart/komparenavtreepart.cpp:72
+msgid "Destination File"
+msgstr "Destination File"
+
+#: komparenavtreepart/komparenavtreepart.cpp:78
+msgid "Source Line"
+msgstr "Source Line"
+
+#: komparenavtreepart/komparenavtreepart.cpp:79
+msgid "Destination Line"
+msgstr "Destination Line"
+
+#: komparenavtreepart/komparenavtreepart.cpp:80
+msgid "Difference"
+msgstr "Difference"
+
+#: komparenavtreepart/komparenavtreepart.cpp:426
+#, c-format
+msgid ""
+"_n: Applied: Changes made to %n line undone\n"
+"Applied: Changes made to  %n lines undone"
+msgstr ""
+"Applied: Changes made to %n line undone\n"
+"Applied: Changes made to  %n lines undone"
+
+#: komparenavtreepart/komparenavtreepart.cpp:429
+#, c-format
+msgid ""
+"_n: Changed %n line\n"
+"Changed %n lines"
+msgstr ""
+"Changed %n line\n"
+"Changed %n lines"
+
+#: komparenavtreepart/komparenavtreepart.cpp:434
+#, c-format
+msgid ""
+"_n: Applied: Insertion of %n line undone\n"
+"Applied: Insertion of %n lines undone"
+msgstr ""
+"Applied: Insertion of %n line undone\n"
+"Applied: Insertion of %n lines undone"
+
+#: komparenavtreepart/komparenavtreepart.cpp:437
+#, c-format
+msgid ""
+"_n: Inserted %n line\n"
+"Inserted %n lines"
+msgstr ""
+"Inserted %n line\n"
+"Inserted %n lines"
+
+#: komparenavtreepart/komparenavtreepart.cpp:442
+#, c-format
+msgid ""
+"_n: Applied: Deletion of %n line undone\n"
+"Applied: Deletion of %n lines undone"
+msgstr ""
+"Applied: Deletion of %n line undone\n"
+"Applied: Deletion of %n lines undone"
+
+#: komparenavtreepart/komparenavtreepart.cpp:445
+#, c-format
+msgid ""
+"_n: Deleted %n line\n"
+"Deleted %n lines"
+msgstr ""
+"Deleted %n line\n"
+"Deleted %n lines"
+
+#: komparenavtreepart/komparenavtreepart.cpp:531
+#: komparepart/kompare_part.cpp:651
+msgid "Unknown"
+msgstr "Unknown"
+
+#: komparenavtreepart/komparenavtreepart.cpp:694
+msgid "KompareNavTreePart"
+msgstr "KompareNavTreePart"
+
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "&Apply Difference"
+
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "Un&apply Difference"
+
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "App&ly All"
+
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "&Unapply All"
+
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "P&revious File"
+
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "N&ext File"
+
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "&Previous Difference"
+
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "&Next Difference"
+
+#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
+msgid ""
+"<qt>No models or no differences, this file: <b>%1</b>"
+", is not a valid diff file.</qt>"
+msgstr ""
+"<qt>No models or no differences, this file: <b>%1</b>"
+", is not a valid diff file.</qt>"
+
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
+msgstr ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
+
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
+".</qt>"
+msgstr ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
+".</qt>"
+
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "Could not open a temporary file."
+
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+
+#: libdiff2/komparemodellist.cpp:368
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+
+#: libdiff2/komparemodellist.cpp:383
+msgid ""
+"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
+". The temporary file is still available under: <b>%2</b>"
+". You can manually copy it to the right place.</qt>"
+msgstr ""
+"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
+". The temporary file is still available under: <b>%2</b>"
+". You can manually copy it to the right place.</qt>"
+
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "Could not parse diff output."
+
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "The files are identical."
+
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "Could not write to the temporary file."
+
+#: kompare_shell.cpp:77
+msgid "Could not find our KompareViewPart."
+msgstr "Could not find our KompareViewPart."
+
+#: kompare_shell.cpp:106
+msgid "Could not load our KompareViewPart."
+msgstr "Could not load our KompareViewPart."
+
+#: kompare_shell.cpp:114
+msgid "Could not find our KompareNavigationPart."
+msgstr "Could not find our KompareNavigationPart."
+
+#: kompare_shell.cpp:138
+msgid "Could not load our KompareNavigationPart."
+msgstr "Could not load our KompareNavigationPart."
+
+#: kompare_shell.cpp:233
+msgid "&Open Diff..."
+msgstr "&Open Diff..."
+
+#: kompare_shell.cpp:234
+msgid "&Compare Files..."
+msgstr "&Compare Files..."
+
+#: kompare_shell.cpp:237
+msgid "&Blend URL with Diff..."
+msgstr "&Blend URL with Diff..."
+
+#: kompare_shell.cpp:246
+msgid "Show T&ext View"
+msgstr "Show T&ext View"
+
+#: kompare_shell.cpp:248
+msgid "Hide T&ext View"
+msgstr "Hide T&ext View"
+
+#: kompare_shell.cpp:257
+msgid " 0 of 0 differences "
+msgstr " 0 of 0 differences "
+
+#: kompare_shell.cpp:258
+msgid " 0 of 0 files "
+msgstr " 0 of 0 files "
+
+#: kompare_shell.cpp:273
+msgid ""
+"_n:  %1 of %n file \n"
+" %1 of %n files "
+msgstr ""
+" %1 of %n file \n"
+" %1 of %n files "
+
+#: kompare_shell.cpp:275
+#, c-format
+msgid ""
+"_n:  %n file \n"
+" %n files "
+msgstr ""
+" %n file \n"
+" %n files "
+
+#: kompare_shell.cpp:278
+msgid ""
+"_n:  %1 of %n difference, %2 applied \n"
+" %1 of %n differences, %2 applied "
+msgstr ""
+" %1 of %n difference, %2 applied \n"
+" %1 of %n differences, %2 applied "
+
+#: kompare_shell.cpp:281
+#, c-format
+msgid ""
+"_n:  %n difference \n"
+" %n differences "
+msgstr ""
+" %n difference \n"
+" %n differences "
+
+#: kompare_shell.cpp:369
+msgid "Blend File/Folder with diff Output"
+msgstr "Blend File/Folder with diff Output"
+
+#: kompare_shell.cpp:370
+msgid "File/Folder"
+msgstr "File/Folder"
+
+#: kompare_shell.cpp:371
+msgid "Diff Output"
+msgstr "Diff Output"
+
+#: kompare_shell.cpp:373
+msgid "Blend"
+msgstr "Blend"
+
+#: kompare_shell.cpp:373
+msgid "Blend this file or folder with the diff output"
+msgstr "Blend this file or folder with the diff output"
+
+#: kompare_shell.cpp:373
+msgid ""
+"If you have entered a file or folder name and a file that contains diff output "
+"in the fields in this dialog then this button will be enabled and pressing it "
+"will open kompare's main view where the output of the entered file or files "
+"from the folder are mixed with the diff output so you can then apply the "
+"difference(s) to a file or to the files. "
+msgstr ""
+"If you have entered a file or folder name and a file that contains diff output "
+"in the fields in this dialogue then this button will be enabled and pressing it "
+"will open kompare's main view where the output of the entered file or files "
+"from the folder are mixed with the diff output so you can then apply the "
+"difference(s) to a file or to the files. "
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "Compare Files or Folders"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Source"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Destination"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Compare"
+
+#: kompare_shell.cpp:402
+msgid "Compare these files or folders"
+msgstr "Compare these files or folders"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid ""
+"If you have entered 2 filenames or 2 folders in the fields in this dialog then "
+"this button will be enabled and pressing it will start a comparison of the "
+"entered files or folders. "
+msgstr ""
+"If you have entered 2 filenames or 2 folders in the fields in this dialogue "
+"then this button will be enabled and pressing it will start a comparison of the "
+"entered files or folders. "
+
+#: kompare_shell.cpp:439
+msgid "Text View"
+msgstr "Text View"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "Here you can enter the files you want to compare."
+
+#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
+msgid "Diff"
+msgstr "Diff"
+
+#: kompareurldialog.cpp:47
+msgid "Here you can change the options for comparing the files."
+msgstr "Here you can change the options for comparing the files."
+
+#: kompareurldialog.cpp:53
+msgid "Here you can change the options for the view."
+msgstr "Here you can change the options for the view."
+
+#. i18n: file komparepart/komparepartui.rc line 13
+#: rc.cpp:15
+#, no-c-format
+msgid "&Difference"
+msgstr "&Difference"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
+#: rc.cpp:21
+#, no-c-format
+msgid "Run Diff In"
+msgstr "Run Diff In"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
+#: rc.cpp:24
+#, no-c-format
+msgid "Command Line"
+msgstr "Command Line"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
+#: rc.cpp:27
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd dir && diff -udHprNa -- source destination"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
+#: rc.cpp:33
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "Look for smaller changes"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
+#: rc.cpp:36
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "Optimise for large files"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
+#: rc.cpp:39
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "Ignore changes in case"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
+#: rc.cpp:42
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "Expand tabs to spaces"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
+#: rc.cpp:45
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "Ignore added or removed empty lines"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
+#: rc.cpp:48
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "Ignore changes in whitespace"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
+#: rc.cpp:51
+#, no-c-format
+msgid "Show function names"
+msgstr "Show function names"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
+#: rc.cpp:54
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "Compare folders recursively"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
+#: rc.cpp:57
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "Treat new files as empty"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
+#: rc.cpp:60
+#, no-c-format
+msgid "Format"
+msgstr "Format"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 244
+#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63
+#, no-c-format
+msgid "Context"
+msgstr "Context"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 252
+#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66
+#, no-c-format
+msgid "Ed"
+msgstr "`Ed"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 260
+#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69
+#, no-c-format
+msgid "Normal"
+msgstr "Normal"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 268
+#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72
+#, no-c-format
+msgid "RCS"
+msgstr "RCS"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 276
+#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75
+#, no-c-format
+msgid "Unified"
+msgstr "Unified"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
+#: rc.cpp:78
+#, no-c-format
+msgid "Side-by-side"
+msgstr "Side-by-side"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
+#: libdialogpages/diffpage.cpp:251 rc.cpp:81
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "Number of context lines:"
+
 #: komparepart/kompareprefdlg.cpp:33
 msgid "Preferences"
 msgstr "Preferences"
@@ -24,10 +508,6 @@ msgstr "Preferences"
 msgid "View Settings"
 msgstr "View Settings"
 
-#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
-msgid "Diff"
-msgstr "Diff"
-
 #: komparepart/kompareprefdlg.cpp:43
 msgid "Diff Settings"
 msgstr "Diff Settings"
@@ -129,41 +609,6 @@ msgstr ""
 msgid "Save Changes?"
 msgstr "Save Changes?"
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 276
-#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75
-#, no-c-format
-msgid "Unified"
-msgstr "Unified"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 244
-#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63
-#, no-c-format
-msgid "Context"
-msgstr "Context"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 268
-#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72
-#, no-c-format
-msgid "RCS"
-msgstr "RCS"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 252
-#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66
-#, no-c-format
-msgid "Ed"
-msgstr "`Ed"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 260
-#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69
-#, no-c-format
-msgid "Normal"
-msgstr "Normal"
-
-#: komparenavtreepart/komparenavtreepart.cpp:531
-#: komparepart/kompare_part.cpp:651
-msgid "Unknown"
-msgstr "Unknown"
-
 #: komparepart/kompare_part.cpp:667
 msgid ""
 "No diff file, or no 2 files have been diffed. Therefore no stats are available."
@@ -219,6 +664,14 @@ msgstr ""
 "Number of hunks: %5\n"
 "Number of differences: %6"
 
+#: libdialogpages/filespage.cpp:53
+msgid "Encoding"
+msgstr "Encoding"
+
+#: libdialogpages/filespage.cpp:64
+msgid "&Files"
+msgstr "&Files"
+
 #: libdialogpages/viewpage.cpp:51
 msgid "Colors"
 msgstr "Colours"
@@ -307,12 +760,6 @@ msgstr ""
 msgid "Lines of Context"
 msgstr "Lines of Context"
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "Number of context lines:"
-
 #: libdialogpages/diffpage.cpp:253
 msgid ""
 "The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -481,26 +928,6 @@ msgstr ""
 msgid "&Exclude"
 msgstr "&Exclude"
 
-#: libdialogpages/filespage.cpp:53
-msgid "Encoding"
-msgstr "Encoding"
-
-#: libdialogpages/filespage.cpp:64
-msgid "&Files"
-msgstr "&Files"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "John Knight"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "anarchist_tomato@herzeleid.net"
-
 #: main.cpp:33
 msgid ""
 "A program to view the differences between files and optionally generate a diff"
@@ -573,432 +1000,6 @@ msgstr "A lot of good advice"
 msgid "Cervisia diff viewer"
 msgstr "Cervisia diff viewer"
 
-#: kompare_shell.cpp:397 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "Compare Files or Folders"
-
-#: kompare_shell.cpp:398 main.cpp:186
-msgid "Source"
-msgstr "Source"
-
-#: kompare_shell.cpp:399 main.cpp:187
-msgid "Destination"
-msgstr "Destination"
-
-#: kompare_shell.cpp:401 main.cpp:189
-msgid "Compare"
-msgstr "Compare"
-
 #: main.cpp:189
 msgid "Compare these files or folder"
 msgstr "Compare these files or folder"
-
-#: kompare_shell.cpp:401 main.cpp:189
-msgid ""
-"If you have entered 2 filenames or 2 folders in the fields in this dialog then "
-"this button will be enabled and pressing it will start a comparison of the "
-"entered files or folders. "
-msgstr ""
-"If you have entered 2 filenames or 2 folders in the fields in this dialogue "
-"then this button will be enabled and pressing it will start a comparison of the "
-"entered files or folders. "
-
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr "Here you can enter the files you want to compare."
-
-#: kompareurldialog.cpp:47
-msgid "Here you can change the options for comparing the files."
-msgstr "Here you can change the options for comparing the files."
-
-#: kompareurldialog.cpp:53
-msgid "Here you can change the options for the view."
-msgstr "Here you can change the options for the view."
-
-#: komparenavtreepart/komparenavtreepart.cpp:61
-msgid "Source Folder"
-msgstr "Source Folder"
-
-#: komparenavtreepart/komparenavtreepart.cpp:66
-msgid "Destination Folder"
-msgstr "Destination Folder"
-
-#: komparenavtreepart/komparenavtreepart.cpp:71
-msgid "Source File"
-msgstr "Source File"
-
-#: komparenavtreepart/komparenavtreepart.cpp:72
-msgid "Destination File"
-msgstr "Destination File"
-
-#: komparenavtreepart/komparenavtreepart.cpp:78
-msgid "Source Line"
-msgstr "Source Line"
-
-#: komparenavtreepart/komparenavtreepart.cpp:79
-msgid "Destination Line"
-msgstr "Destination Line"
-
-#: komparenavtreepart/komparenavtreepart.cpp:80
-msgid "Difference"
-msgstr "Difference"
-
-#: komparenavtreepart/komparenavtreepart.cpp:426
-#, c-format
-msgid ""
-"_n: Applied: Changes made to %n line undone\n"
-"Applied: Changes made to  %n lines undone"
-msgstr ""
-"Applied: Changes made to %n line undone\n"
-"Applied: Changes made to  %n lines undone"
-
-#: komparenavtreepart/komparenavtreepart.cpp:429
-#, c-format
-msgid ""
-"_n: Changed %n line\n"
-"Changed %n lines"
-msgstr ""
-"Changed %n line\n"
-"Changed %n lines"
-
-#: komparenavtreepart/komparenavtreepart.cpp:434
-#, c-format
-msgid ""
-"_n: Applied: Insertion of %n line undone\n"
-"Applied: Insertion of %n lines undone"
-msgstr ""
-"Applied: Insertion of %n line undone\n"
-"Applied: Insertion of %n lines undone"
-
-#: komparenavtreepart/komparenavtreepart.cpp:437
-#, c-format
-msgid ""
-"_n: Inserted %n line\n"
-"Inserted %n lines"
-msgstr ""
-"Inserted %n line\n"
-"Inserted %n lines"
-
-#: komparenavtreepart/komparenavtreepart.cpp:442
-#, c-format
-msgid ""
-"_n: Applied: Deletion of %n line undone\n"
-"Applied: Deletion of %n lines undone"
-msgstr ""
-"Applied: Deletion of %n line undone\n"
-"Applied: Deletion of %n lines undone"
-
-#: komparenavtreepart/komparenavtreepart.cpp:445
-#, c-format
-msgid ""
-"_n: Deleted %n line\n"
-"Deleted %n lines"
-msgstr ""
-"Deleted %n line\n"
-"Deleted %n lines"
-
-#: komparenavtreepart/komparenavtreepart.cpp:694
-msgid "KompareNavTreePart"
-msgstr "KompareNavTreePart"
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "&Difference"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "Run Diff In"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Command Line"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr "cd dir && diff -udHprNa -- source destination"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "Look for smaller changes"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "Optimise for large files"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "Ignore changes in case"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "Expand tabs to spaces"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "Ignore added or removed empty lines"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "Ignore changes in whitespace"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "Show function names"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "Compare folders recursively"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "Treat new files as empty"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Format"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "Side-by-side"
-
-#: kompare_shell.cpp:77
-msgid "Could not find our KompareViewPart."
-msgstr "Could not find our KompareViewPart."
-
-#: kompare_shell.cpp:106
-msgid "Could not load our KompareViewPart."
-msgstr "Could not load our KompareViewPart."
-
-#: kompare_shell.cpp:114
-msgid "Could not find our KompareNavigationPart."
-msgstr "Could not find our KompareNavigationPart."
-
-#: kompare_shell.cpp:138
-msgid "Could not load our KompareNavigationPart."
-msgstr "Could not load our KompareNavigationPart."
-
-#: kompare_shell.cpp:232
-msgid "&Open Diff..."
-msgstr "&Open Diff..."
-
-#: kompare_shell.cpp:233
-msgid "&Compare Files..."
-msgstr "&Compare Files..."
-
-#: kompare_shell.cpp:236
-msgid "&Blend URL with Diff..."
-msgstr "&Blend URL with Diff..."
-
-#: kompare_shell.cpp:245
-msgid "Show T&ext View"
-msgstr "Show T&ext View"
-
-#: kompare_shell.cpp:247
-msgid "Hide T&ext View"
-msgstr "Hide T&ext View"
-
-#: kompare_shell.cpp:256
-msgid " 0 of 0 differences "
-msgstr " 0 of 0 differences "
-
-#: kompare_shell.cpp:257
-msgid " 0 of 0 files "
-msgstr " 0 of 0 files "
-
-#: kompare_shell.cpp:272
-msgid ""
-"_n:  %1 of %n file \n"
-" %1 of %n files "
-msgstr ""
-" %1 of %n file \n"
-" %1 of %n files "
-
-#: kompare_shell.cpp:274
-#, c-format
-msgid ""
-"_n:  %n file \n"
-" %n files "
-msgstr ""
-" %n file \n"
-" %n files "
-
-#: kompare_shell.cpp:277
-msgid ""
-"_n:  %1 of %n difference, %2 applied \n"
-" %1 of %n differences, %2 applied "
-msgstr ""
-" %1 of %n difference, %2 applied \n"
-" %1 of %n differences, %2 applied "
-
-#: kompare_shell.cpp:280
-#, c-format
-msgid ""
-"_n:  %n difference \n"
-" %n differences "
-msgstr ""
-" %n difference \n"
-" %n differences "
-
-#: kompare_shell.cpp:368
-msgid "Blend File/Folder with diff Output"
-msgstr "Blend File/Folder with diff Output"
-
-#: kompare_shell.cpp:369
-msgid "File/Folder"
-msgstr "File/Folder"
-
-#: kompare_shell.cpp:370
-msgid "Diff Output"
-msgstr "Diff Output"
-
-#: kompare_shell.cpp:372
-msgid "Blend"
-msgstr "Blend"
-
-#: kompare_shell.cpp:372
-msgid "Blend this file or folder with the diff output"
-msgstr "Blend this file or folder with the diff output"
-
-#: kompare_shell.cpp:372
-msgid ""
-"If you have entered a file or folder name and a file that contains diff output "
-"in the fields in this dialog then this button will be enabled and pressing it "
-"will open kompare's main view where the output of the entered file or files "
-"from the folder are mixed with the diff output so you can then apply the "
-"difference(s) to a file or to the files. "
-msgstr ""
-"If you have entered a file or folder name and a file that contains diff output "
-"in the fields in this dialogue then this button will be enabled and pressing it "
-"will open kompare's main view where the output of the entered file or files "
-"from the folder are mixed with the diff output so you can then apply the "
-"difference(s) to a file or to the files. "
-
-#: kompare_shell.cpp:401
-msgid "Compare these files or folders"
-msgstr "Compare these files or folders"
-
-#: kompare_shell.cpp:439
-msgid "Text View"
-msgstr "Text View"
-
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "&Apply Difference"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "Un&apply Difference"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "App&ly All"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "&Unapply All"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "P&revious File"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "N&ext File"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "&Previous Difference"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "&Next Difference"
-
-#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
-msgid ""
-"<qt>No models or no differences, this file: <b>%1</b>"
-", is not a valid diff file.</qt>"
-msgstr ""
-"<qt>No models or no differences, this file: <b>%1</b>"
-", is not a valid diff file.</qt>"
-
-#: libdiff2/komparemodellist.cpp:246
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-
-#: libdiff2/komparemodellist.cpp:271
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "Could not open a temporary file."
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-
-#: libdiff2/komparemodellist.cpp:368
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-
-#: libdiff2/komparemodellist.cpp:383
-msgid ""
-"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
-". The temporary file is still available under: <b>%2</b>"
-". You can manually copy it to the right place.</qt>"
-msgstr ""
-"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
-". The temporary file is still available under: <b>%2</b>"
-". You can manually copy it to the right place.</qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "Could not parse diff output."
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "The files are identical."
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "Could not write to the temporary file."
diff --git a/tde-i18n-en_GB/messages/tdesdk/kres_bugzilla.po b/tde-i18n-en_GB/messages/tdesdk/kres_bugzilla.po
index 3343b16d87e..23e2cb8388f 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kres_bugzilla.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kres_bugzilla.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_bugzilla\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-10-12 16:30+0100\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdesdk/kstartperf.po b/tde-i18n-en_GB/messages/tdesdk/kstartperf.po
index 70660d69a61..b26926c46c9 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kstartperf.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kstartperf.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kstartperf\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-06-23 14:07+0100\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdesdk/kuiviewer.po b/tde-i18n-en_GB/messages/tdesdk/kuiviewer.po
index 49c0f9f9d5d..88d5e96154f 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kuiviewer.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kuiviewer.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kuiviewer\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-11-03 18:00+0000\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdesdk/spy.po b/tde-i18n-en_GB/messages/tdesdk/spy.po
index c93be5695c0..9cdcc2f620e 100644
--- a/tde-i18n-en_GB/messages/tdesdk/spy.po
+++ b/tde-i18n-en_GB/messages/tdesdk/spy.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: spy\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-01-19 16:28+0000\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,14 +27,6 @@ msgstr "Type"
 msgid "Member Name"
 msgstr "Member Name"
 
-#: classinfoview.cpp:30 navview.cpp:28 propsview.cpp:53
-msgid "Name"
-msgstr "Name"
-
-#: classinfoview.cpp:31 propsview.cpp:54
-msgid "Value"
-msgstr "Value"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -46,10 +39,6 @@ msgid ""
 "Your emails"
 msgstr "malcolm.hunter@gmx.co.uk"
 
-#: main.cpp:25 main.cpp:38
-msgid "Spy"
-msgstr "Spy"
-
 #: spy.cpp:67
 msgid "Signals && Slots"
 msgstr "Signals && Slots"
@@ -62,6 +51,14 @@ msgstr "Receivers"
 msgid "Class Info"
 msgstr "Class Info"
 
+#: classinfoview.cpp:30 navview.cpp:28 propsview.cpp:53
+msgid "Name"
+msgstr "Name"
+
+#: classinfoview.cpp:31 propsview.cpp:54
+msgid "Value"
+msgstr "Value"
+
 #: propsview.cpp:56
 msgid "Access"
 msgstr "Access"
@@ -74,6 +71,10 @@ msgstr "Designable"
 msgid "Type Flags"
 msgstr "Type Flags"
 
+#: main.cpp:25 main.cpp:38
+msgid "Spy"
+msgstr "Spy"
+
 #: sigslotview.cpp:30
 msgid "Signals/Slots"
 msgstr "Signals/Slots"
diff --git a/tde-i18n-en_GB/messages/tdesdk/tdecachegrind.po b/tde-i18n-en_GB/messages/tdesdk/tdecachegrind.po
index 3af45fa04db..4e178fbf10b 100644
--- a/tde-i18n-en_GB/messages/tdesdk/tdecachegrind.po
+++ b/tde-i18n-en_GB/messages/tdesdk/tdecachegrind.po
@@ -7,182 +7,399 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdecachegrind\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-12-30 14:02+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: instritem.cpp:106 sourceitem.cpp:86
-msgid "Active call to '%1'"
-msgstr "Active call to '%1'"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Jonathan Riddell"
 
-#: instritem.cpp:108 sourceitem.cpp:88
+#: _translatorinfo.cpp:3
 msgid ""
-"_n: %n call to '%1'\n"
-"%n calls to '%1'"
-msgstr ""
-"%n call to '%1'\n"
-"%n calls to '%1'"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kde-en-gb@jriddell.org"
 
-#: instritem.cpp:137
-msgid "Jump %1 of %2 times to 0x%3"
-msgstr "Jump %1 of %2 times to 0x%3"
+#: cachegrindloader.cpp:141
+msgid "Import filter for Cachegrind/Callgrind generated profile data files"
+msgstr "Import filter for Cachegrind/Callgrind generated profile data files"
 
-#: instritem.cpp:142
-msgid "Jump %1 times to 0x%2"
-msgstr "Jump %1 times to 0x%2"
+#: cachegrindloader.cpp:738
+#, c-format
+msgid "Loading %1"
+msgstr "Loading %1"
 
-#: instritem.cpp:185 sourceitem.cpp:169
-msgid "(cycle)"
-msgstr "(cycle)"
+#: tabview.cpp:64
+msgid "Move to Top"
+msgstr "Move to Top"
 
-#: tracedata.cpp:157
-msgid "Abstract Item"
-msgstr "Abstract Item"
+#: tabview.cpp:68
+msgid "Move to Right"
+msgstr "Move to Right"
 
-#: tracedata.cpp:158
-msgid "Cost Item"
-msgstr "Cost Item"
+#: tabview.cpp:72
+msgid "Move to Bottom"
+msgstr "Move to Bottom"
 
-#: tracedata.cpp:159
-msgid "Part Source Line"
-msgstr "Part Source Line"
+#: tabview.cpp:76
+msgid "Move to Bottom Left"
+msgstr "Move to Bottom Left"
 
-#: tracedata.cpp:160
-msgid "Source Line"
-msgstr "Source Line"
+#: tabview.cpp:77 tabview.cpp:94 treemap.cpp:2908
+msgid "Bottom Left"
+msgstr "Bottom Left"
 
-#: tracedata.cpp:161
-msgid "Part Line Call"
-msgstr "Part Line Call"
+#: tabview.cpp:79
+msgid "Move Area To"
+msgstr "Move Area To"
 
-#: tracedata.cpp:162
-msgid "Line Call"
-msgstr "Line Call"
+#: tabview.cpp:81
+msgid "Hide This Tab"
+msgstr "Hide This Tab"
 
-#: tracedata.cpp:163
-msgid "Part Jump"
-msgstr "Part Jump"
+#: tabview.cpp:82
+msgid "Hide Area"
+msgstr "Hide Area"
 
-#: tracedata.cpp:164
-msgid "Jump"
-msgstr "Jump"
+#: tabview.cpp:95
+msgid "Show Hidden On"
+msgstr "Show Hidden On"
 
-#: tracedata.cpp:165
-msgid "Part Instruction"
-msgstr "Part Instruction"
+#: tabview.cpp:242
+msgid "(No profile data file loaded)"
+msgstr "(No profile data file loaded)"
 
-#: tracedata.cpp:166
-msgid "Instruction"
-msgstr "Instruction"
+#: tabview.cpp:281
+msgid "Types"
+msgstr "Types"
 
-#: tracedata.cpp:167
-msgid "Part Instruction Jump"
-msgstr "Part Instruction Jump"
+#: tabview.cpp:284
+msgid "Callers"
+msgstr "Callers"
 
-#: tracedata.cpp:168
-msgid "Instruction Jump"
-msgstr "Instruction Jump"
+#: tabview.cpp:287
+msgid "All Callers"
+msgstr "All Callers"
 
-#: tracedata.cpp:169
-msgid "Part Instruction Call"
-msgstr "Part Instruction Call"
+#: tabview.cpp:290
+msgid "Caller Map"
+msgstr "Caller Map"
 
-#: tracedata.cpp:170
-msgid "Instruction Call"
-msgstr "Instruction Call"
+#: tabview.cpp:293
+msgid "Source"
+msgstr "Source"
 
-#: tracedata.cpp:171
-msgid "Part Call"
-msgstr "Part Call"
+#: tabview.cpp:297
+msgid "Parts"
+msgstr "Parts"
 
-#: tracedata.cpp:172
-msgid "Call"
-msgstr "Call"
+#: tabview.cpp:300
+msgid "Call Graph"
+msgstr "Call Graph"
 
-#: tracedata.cpp:173
-msgid "Part Function"
-msgstr "Part Function"
+#: tabview.cpp:303
+msgid "Callees"
+msgstr "Callees"
 
-#: tracedata.cpp:174
-msgid "Function Source File"
-msgstr "Function Source File"
+#: tabview.cpp:306
+msgid "All Callees"
+msgstr "All Callees"
 
-#. i18n: file dumpselectionbase.ui line 300
-#: rc.cpp:144 rc.cpp:273 rc.cpp:318 rc.cpp:342 tracedata.cpp:175
-#, no-c-format
-msgid "Function"
-msgstr "Function"
+#: tabview.cpp:310
+msgid "Callee Map"
+msgstr "Callee Map"
 
-#: tracedata.cpp:176
-msgid "Function Cycle"
-msgstr "Function Cycle"
+#: instrview.cpp:131 tabview.cpp:313
+msgid "Assembler"
+msgstr "Assembler"
 
-#: tracedata.cpp:177
-msgid "Part Class"
-msgstr "Part Class"
+#: tabview.cpp:553
+msgid ""
+"<b>Information Tabs</b>"
+"<p>This widget shows information for the current selected function in different "
+"tabs: "
+"<ul>"
+"<li>The Costs tab shows a list of available event types and the inclusive and "
+"self costs regarding to these types.</li>"
+"<li>The Parts tab shows a list of trace parts if the trace consists of more "
+"than one part (otherwise, this tab is hided). The cost of the selected function "
+"spent in the different parts together with the calls happening is shown.</li>"
+"<li>The Call Lists tab shows direct callers and callees of the function in more "
+"detail.</li>"
+"<li>The Coverage tab shows the same is the Call Lists tab, but not only direct "
+"callers and callees but also indirect ones.</li>"
+"<li>The Call Graph tab shows a graphical visualization of the calls done by "
+"this function.</li>"
+"<li>The Source tab presents annotated source code if debugging information and "
+"the source file is available.</li>"
+"<li>The Assembler tab presents annotated assembler code if trace information on "
+"instruction level is available.</li></ul>For more information, see the <em>"
+"What's This?</em> help of the corresponding tab widget</p>"
+msgstr ""
+"<b>Information Tabs</b>"
+"<p>This widget shows information for the currently selected function in "
+"different tabs: "
+"<ul>"
+"<li>The Costs tab shows a list of available event types and the inclusive and "
+"self costs associated with these types.</li>"
+"<li>The Parts tab shows a list of trace parts if the trace consists of more "
+"than one part (otherwise this tab is hidden). The cost of the selected function "
+"spent in the different parts, together with the calls that are taking place, is "
+"shown.</li>"
+"<li>The Call Lists tab shows direct callers and callees of the function in more "
+"detail.</li>"
+"<li>The Coverage tab shows the same as the Call Lists tab, but shows indirect "
+"as well as direct callers and callees.</li>"
+"<li>The Call Graph tab shows a graphical visualisation of the calls made by "
+"this function.</li>"
+"<li>The Source tab presents annotated source code if debugging information and "
+"the source file is available.</li>"
+"<li>The Assembler tab presents annotated assembler code if trace information at "
+"instruction level is available.</li></ul>For more information, see the <em>"
+"What's This?</em> help of the corresponding tab widget</p>"
 
-#: tracedata.cpp:178
-msgid "Class"
-msgstr "Class"
+#: tabview.cpp:630
+msgid "(No Data loaded)"
+msgstr "(No Data loaded)"
 
-#: tracedata.cpp:179
-msgid "Part Source File"
-msgstr "Part Source File"
+#: tabview.cpp:631
+msgid "(No function selected)"
+msgstr "(No function selected)"
 
-#: tracedata.cpp:180
-msgid "Source File"
-msgstr "Source File"
+#: tips.txt:3
+msgid ""
+"<p>...that the <em>What's This?</em> help for every GUI widget\n"
+"in KCachegrind contains detailed usage information for this widget?\n"
+"It is highly recommended to read at least these help texts on first\n"
+"use. Request <em>What's This?</em> help by pressing\n"
+"Shift+F1 and clicking on the widget.</p>\n"
+msgstr ""
+"<p>...that the <em>What's This?</em> help for every GUI widget\n"
+"in KCachegrind contains detailed usage information for this widget?\n"
+"It is highly recommended to read at least these help texts on first\n"
+"use. Request <em>What's This?</em> help by pressing\n"
+"Shift+F1 and clicking on the widget.</p>\n"
 
-#: tracedata.cpp:181
-msgid "Part ELF Object"
-msgstr "Part ELF Object"
+#: tips.txt:12
+msgid ""
+"<p>...that you can get profile information at instruction level\n"
+"with Calltree when you provide the option <em>--dump-instr=yes</em>?\n"
+"Use the Assembler View for the instruction annotations.\n"
+"</p>\n"
+msgstr ""
+"<p>...that you can get profile information at instruction level\n"
+"with Calltree when you provide the option <em>--dump-instr=yes</em>?\n"
+"Use the Assembler View for the instruction annotations.\n"
+"</p>\n"
 
-#: tracedata.cpp:182
-msgid "ELF Object"
-msgstr "ELF Object"
+#: tips.txt:20
+msgid ""
+"<p>...that you can use Alt-Left/Right keys of your keyboard to go\n"
+"back/forward in the active object history ?</p>\n"
+msgstr ""
+"<p>...that you can use Alt-Left/Right keys of your keyboard to go\n"
+"backwards/forwards in the active object history ?</p>\n"
 
-#: partview.cpp:46 tracedata.cpp:183
-msgid "Profile Part"
-msgstr "Profile Part"
+#: tips.txt:26
+msgid ""
+"<p>...that you can navigate in the Callee/Caller Map View using\n"
+"arrow keys? Use Left/Right to change to siblings of the current\n"
+"item; use Up/Down to go one nesting level up/down. To select\n"
+"the current item, press Space, and to activate it, press Return.\n"
+"</p>\n"
+msgstr ""
+"<p>...that you can navigate in the Callee/Caller Map View using\n"
+"arrow keys? Use Left/Right to change to siblings of the current\n"
+"item; use Up/Down to go one nesting level up/down. To select\n"
+"the current item, press Space, and to activate it, press Return.\n"
+"</p>\n"
 
-#: tracedata.cpp:184
-msgid "Program Trace"
-msgstr "Program Trace"
+#: tips.txt:35
+msgid ""
+"<p>...that you can navigate in the Call Graph View using\n"
+"arrow keys? Use Up/Down to go one calling level up/down, alternating\n"
+"between calls and functions. Use Left/Right to change to siblings of a current\n"
+"selected call. To activate the current item, press Return.\n"
+"</p>\n"
+msgstr ""
+"<p>...that you can navigate in the Call Graph View using\n"
+"arrow keys? Use Up/Down to go one calling level up/down, alternating\n"
+"between calls and functions. Use Left/Right to change to siblings of a current\n"
+"selected call. To activate the current item, press Return.\n"
+"</p>\n"
 
-#: tracedata.cpp:245
-msgid "%1 from %2"
-msgstr "%1 from %2"
+#: tips.txt:44
+msgid ""
+"<p>...that you can rapidly locate a function by entering part of its\n"
+"name (case-insensitive) into the edit line of the toolbar\n"
+"and hit return?</p>\n"
+msgstr ""
+"<p>...that you can rapidly locate a function by entering part of its\n"
+"name (case-insensitive) into the edit line of the toolbar\n"
+"and hit return?</p>\n"
 
-#: partgraph.cpp:423 tracedata.cpp:253 tracedata.cpp:258 tracedata.cpp:2828
-#: tracedata.cpp:3245 tracedata.cpp:3331 tracedata.cpp:4169 tracedata.cpp:4177
-#: tracedata.cpp:4242
-msgid "(unknown)"
-msgstr "(unknown)"
+#: tips.txt:51
+msgid ""
+"<p>...that you can assign custom colors to \n"
+"ELF objects/C++ Classes/Source Files for graph coloring\n"
+"in <em>Settings->Configure KCachegrind...</em>?</p>\n"
+msgstr ""
+"<p>...that you can assign custom colours to \n"
+"ELF objects/C++ Classes/Source Files for graph colouring\n"
+"in <em>Settings->Configure KCachegrind...</em>?</p>\n"
 
-#: tracedata.cpp:2587
-msgid "(no caller)"
-msgstr "(no caller)"
+#: tips.txt:58
+msgid ""
+"<p>...that you can see if debug info is available for a selected \n"
+"function by looking at the location label in the Info tab or\n"
+"the source listing header in the source tab?</p>\n"
+"<p>There must be the name of the source file (with extension).\n"
+"If KCachegrind still doesn't show the source, make sure that you\n"
+"have added the directory of the source file to the\n"
+"<em>Source Directories</em> list in the configuration.\n"
+msgstr ""
+"<p>...that you can see if debug info is available for a selected \n"
+"function by looking at the location label in the Info tab or\n"
+"the source listing header in the source tab?</p>\n"
+"<p>There must be the name of the source file (with extension).\n"
+"If KCachegrind still doesn't show the source, make sure that you\n"
+"have added the directory of the source file to the\n"
+"<em>Source Directories</em> list in the configuration.\n"
 
-#: tracedata.cpp:2594 tracedata.cpp:2613
-msgid "%1 via %2"
-msgstr "%1 via %2"
+#: tips.txt:69
+msgid ""
+"<p>...that you can configure whether KCachgrind should\n"
+"show absolute event counts or relative ones (percentage display)?</p>\n"
+msgstr ""
+"<p>...that you can configure whether KCachgrind should\n"
+"show absolute event counts or relative ones (percentage display)?</p>\n"
 
-#: tracedata.cpp:2603
-msgid "(no callee)"
-msgstr "(no callee)"
+#: tips.txt:75
+msgid ""
+"<p>...that you can configure the maximum number of items\n"
+"for all function lists in KCachegrind? Limiting the number\n"
+"of items is done to get a fast reacting GUI. The last item in\n"
+"the list will show you the number of skipped functions, together\n"
+"with a cost condition for these skipped functions.</p>\n"
+"<p>To activate a function with small costs, search for it and select\n"
+"it in the flat profile. Selecting functions with small cost will\n"
+"temporarily add them to the flat profile list.</p>\n"
+msgstr ""
+"<p>...that you can configure the maximum number of items\n"
+"for all function lists in KCachegrind? Limiting the number\n"
+"of items is done to get a fast reacting GUI. The last item in\n"
+"the list will show you the number of skipped functions, together\n"
+"with a cost condition for these skipped functions.</p>\n"
+"<p>To activate a function with small costs, search for it and select\n"
+"it in the flat profile. Selecting functions with small cost will\n"
+"temporarily add them to the flat profile list.</p>\n"
 
-#: tracedata.cpp:4471
-msgid "(not found)"
-msgstr "(not found)"
+#: tips.txt:87
+msgid ""
+"<p>...that the Coverage tab - in contrast to the Call Lists tab -\n"
+"shows <em>all</em> functions that are calling the selected function\n"
+"(upper part) / are called by the selected function (bottom part),\n"
+"no matter how many function are between them on the stack?</p>\n"
+"<p>Examples:</p>\n"
+"<p>An entry in the upper list for function foo1() with a value of 50%\n"
+"with function bar() selected means that 50% of all the cost of function\n"
+"bar() happened while called from function foo1().</p>\n"
+"<p>An entry in the bottom list for function foo2() with a value of 50%\n"
+"with function bar() selected means that 50% of all the cost of function\n"
+"bar() happened while calling foo2() from bar().</p>\n"
+msgstr ""
+"<p>...that the Coverage tab - in contrast to the Call Lists tab -\n"
+"shows <em>all</em> functions that are calling the selected function\n"
+"(upper part) / are called by the selected function (bottom part),\n"
+"no matter how many function are between them on the stack?</p>\n"
+"<p>Examples:</p>\n"
+"<p>An entry in the upper list for function foo1() with a value of 50%\n"
+"with function bar() selected means that 50% of all the cost of function\n"
+"bar() happened while called from function foo1().</p>\n"
+"<p>An entry in the bottom list for function foo2() with a value of 50%\n"
+"with function bar() selected means that 50% of all the cost of function\n"
+"bar() happened while calling foo2() from bar().</p>\n"
 
-#: tracedata.cpp:5021
-msgid "Recalculating Function Cycles..."
-msgstr "Recalculating Function Cycles..."
+#: tips.txt:102
+msgid ""
+"<p>...that waiting for the tool tip inside of a tree map\n"
+"shows the list of names of the nested rectangles the mouse\n"
+"pointer is over?</p>\n"
+"<p>Items from this list can be selected by pressing the right\n"
+"mouse button.</p>\n"
+msgstr ""
+"<p>...that waiting for the tool tip inside of a tree map\n"
+"shows the list of names of the nested rectangles the mouse\n"
+"pointer is over?</p>\n"
+"<p>Items from this list can be selected by pressing the right\n"
+"mouse button.</p>\n"
+
+#: tips.txt:111
+msgid ""
+"<p>...that you can constrain the cost counts shown to only a\n"
+"few parts of the whole trace by selecting these parts in the\n"
+"\"Trace Selection\" Dockable?</p>\n"
+"<p>To generate multiple parts in a profiling run with\n"
+"cachegrind, use e.g. option --cachedumps=xxx for parts\n"
+"of a length of xxx basic blocks (A basic block is a run\n"
+"of not-branching assembler statements inside of your program\n"
+"code).</p>\n"
+msgstr ""
+"<p>...that you can constrain the cost counts shown to only a\n"
+"few parts of the whole trace by selecting these parts in the\n"
+"\"Trace Selection\" Dockable?</p>\n"
+"<p>To generate multiple parts in a profiling run with\n"
+"cachegrind, use e.g. option --cachedumps=xxx for parts\n"
+"of a length of xxx basic blocks (A basic block is a run\n"
+"of not-branching assembler statements inside of your program\n"
+"code).</p>\n"
+
+#. i18n: file dumpselectionbase.ui line 824
+#: configdlg.cpp:58 rc.cpp:249
+#, no-c-format
+msgid "ELF Objects"
+msgstr "ELF Objects"
+
+#: configdlg.cpp:60
+msgid "Source Files"
+msgstr "Source Files"
+
+#: configdlg.cpp:61
+msgid "C++ Classes"
+msgstr "C++ Classes"
+
+#: configdlg.cpp:62
+msgid "Function (no Grouping)"
+msgstr "Function (no Grouping)"
+
+#: configdlg.cpp:157 configdlg.cpp:350 configdlg.cpp:371
+msgid "(always)"
+msgstr "(always)"
+
+#: configdlg.cpp:210
+msgid "KCachegrind Configuration"
+msgstr "KCachegrind Configuration"
+
+#: configdlg.cpp:211
+msgid ""
+"The Maximum Number of List Items should be below 500.The previous set value "
+"(%1) will still be used."
+msgstr ""
+"The Maximum Number of List Items should be below 500.The previous set value "
+"(%1) will still be used."
+
+#: configdlg.cpp:384
+msgid "Choose Source Folder"
+msgstr "Choose Source Folder"
 
 #. i18n: file dumpselectionbase.ui line 550
 #: callmapview.cpp:59 partselection.cpp:58 rc.cpp:192
@@ -225,11 +442,11 @@ msgstr "Hide Selected Parts"
 msgid "Unhide Hidden Parts"
 msgstr "Unhide Hidden Parts"
 
-#: partselection.cpp:302 toplevel.cpp:1692
+#: partselection.cpp:302 toplevel.cpp:1687
 msgid "Go Back"
 msgstr "Go Back"
 
-#: callgraphview.cpp:2571 partselection.cpp:320
+#: callgraphview.cpp:2570 partselection.cpp:320
 msgid "Visualization"
 msgstr "Visualisation"
 
@@ -285,9 +502,213 @@ msgstr "Show Info"
 msgid "(no trace loaded)"
 msgstr "(no trace loaded)"
 
-#: costtypeview.cpp:42
-msgid "Event Type"
-msgstr "Event Type"
+#. i18n: file dumpselectionbase.ui line 950
+#: callmapview.cpp:61 rc.cpp:276 rc.cpp:321
+#, no-c-format
+msgid "Location"
+msgstr "Location"
+
+#. i18n: file dumpselectionbase.ui line 754
+#: callmapview.cpp:63 rc.cpp:234 rc.cpp:339
+#, no-c-format
+msgid "Calls"
+msgstr "Calls"
+
+#: callmapview.cpp:98
+msgid ""
+"<b>Caller Map</b>"
+"<p>This graph shows the nested hierarchy of all callers of the current "
+"activated function. Each colored rectangle represents a function; its size "
+"tries to be proportional to the cost spent therein while the active function is "
+"running (however, there are drawing constrains).</p>"
+msgstr ""
+"<b>Caller Map</b>"
+"<p>This graph shows the nested hierarchy of all callers of the current "
+"activated function. Each coloured rectangle represents a function; its size "
+"tries to be proportional to the cost spent therein while the active function is "
+"running (however, there are drawing constrains).</p>"
+
+#: callmapview.cpp:105
+msgid ""
+"<b>Call Map</b>"
+"<p>This graph shows the nested hierarchy of all callees of the current "
+"activated function. Each colored rectangle represents a function; its size "
+"tries to be proportional to the cost spent therein while the active function is "
+"running (however, there are drawing constrains).</p>"
+msgstr ""
+"<b>Call Map</b>"
+"<p>This graph shows the nested hierarchy of all callees of the current "
+"activated function. Each coloured rectangle represents a function; its size "
+"tries to be proportional to the cost spent therein while the active function is "
+"running (however, there are drawing constrains).</p>"
+
+#: callmapview.cpp:113
+msgid ""
+"<p>Appearance options can be found in the in the context menu. To get exact "
+"size proportions, choose 'Hide incorrect borders'. As this mode can be <em>"
+"very</em> time consuming, you may want to limit the maximum drawn nesting level "
+"before. 'Best' determinates the split direction for children from the aspect "
+"ratio of the parent. 'Always Best' decides on remaining space for each sibling. "
+"'Ignore Proportions' takes space for function name drawing <em>before</em> "
+"drawing children. Note that size proportions can get <em>heavily</em> wrong.</p>"
+"<p>This is a <em>TreeMap</em> widget. Keyboard navigation is available with the "
+"left/right arrow keys for traversing siblings, and up/down arrow keys to go a "
+"nesting level up/down. <em>Return</em> activates the current item.</p>"
+msgstr ""
+"<p>Appearance options can be found in the in the context menu. To get exact "
+"size proportions, choose 'Hide incorrect borders'. As this mode can be <em>"
+"very</em> time consuming, you may want to limit the maximum drawn nesting level "
+"before. 'Best' determinates the split direction for children from the aspect "
+"ratio of the parent. 'Always Best' decides on remaining space for each sibling. "
+"'Ignore Proportions' takes space for function name drawing <em>before</em> "
+"drawing children. Note that size proportions can get <em>heavily</em> wrong.</p>"
+"<p>This is a <em>TreeMap</em> widget. Keyboard navigation is available with the "
+"left/right arrow keys for traversing siblings, and up/down arrow keys to go a "
+"nesting level up/down. <em>Return</em> activates the current item.</p>"
+
+#: callmapview.cpp:167
+msgid "Go To"
+msgstr "Go To"
+
+#: callmapview.cpp:184
+msgid "Stop at Depth"
+msgstr "Stop at Depth"
+
+#: callmapview.cpp:187 treemap.cpp:3101
+msgid "No Depth Limit"
+msgstr "No Depth Limit"
+
+#: callmapview.cpp:190
+msgid "Depth 10"
+msgstr "Depth 10"
+
+#: callmapview.cpp:192
+msgid "Depth 15"
+msgstr "Depth 15"
+
+#: callmapview.cpp:194
+msgid "Depth 20"
+msgstr "Depth 20"
+
+#: callmapview.cpp:198 treemap.cpp:3107
+msgid "Depth of '%1' (%2)"
+msgstr "Depth of '%1' (%2)"
+
+#: callmapview.cpp:204
+msgid "Decrement Depth (to %1)"
+msgstr "Decrement Depth (to %1)"
+
+#: callmapview.cpp:205
+msgid "Increment Depth (to %1)"
+msgstr "Increment Depth (to %1)"
+
+#: callmapview.cpp:209
+msgid "Stop at Function"
+msgstr "Stop at Function"
+
+#: callmapview.cpp:210
+msgid "No Function Limit"
+msgstr "No Function Limit"
+
+#: callmapview.cpp:240
+msgid "Stop at Area"
+msgstr "Stop at Area"
+
+#: callmapview.cpp:243 treemap.cpp:3039
+msgid "No Area Limit"
+msgstr "No Area Limit"
+
+#: callmapview.cpp:246
+msgid "50 Pixels"
+msgstr "50 Pixels"
+
+#: callmapview.cpp:248
+msgid "100 Pixels"
+msgstr "100 Pixels"
+
+#: callmapview.cpp:250
+msgid "200 Pixels"
+msgstr "200 Pixels"
+
+#: callmapview.cpp:252
+msgid "500 Pixels"
+msgstr "500 Pixels"
+
+#: callmapview.cpp:258 treemap.cpp:3045
+msgid "Area of '%1' (%2)"
+msgstr "Area of '%1' (%2)"
+
+#: callmapview.cpp:264 treemap.cpp:3071
+msgid "Double Area Limit (to %1)"
+msgstr "Double Area Limit (to %1)"
+
+#: callmapview.cpp:266
+msgid "Half Area Limit (to %1)"
+msgstr "Half Area Limit (to %1)"
+
+#: callmapview.cpp:273
+msgid "Visualisation"
+msgstr "Visualisation"
+
+#: callmapview.cpp:277
+msgid "Split Direction"
+msgstr "Split Direction"
+
+#: callmapview.cpp:279
+msgid "Skip Incorrect Borders"
+msgstr "Skip Incorrect Borders"
+
+#: callmapview.cpp:284
+msgid "Border Width"
+msgstr "Border Width"
+
+#: callmapview.cpp:285
+msgid "Border 0"
+msgstr "Border 0"
+
+#: callmapview.cpp:288
+msgid "Border 1"
+msgstr "Border 1"
+
+#: callmapview.cpp:290
+msgid "Border 2"
+msgstr "Border 2"
+
+#: callmapview.cpp:292
+msgid "Border 3"
+msgstr "Border 3"
+
+#: callmapview.cpp:297
+msgid "Draw Symbol Names"
+msgstr "Draw Symbol Names"
+
+#: callmapview.cpp:298
+msgid "Draw Cost"
+msgstr "Draw Cost"
+
+#: callmapview.cpp:299
+msgid "Draw Location"
+msgstr "Draw Location"
+
+#: callmapview.cpp:300
+msgid "Draw Calls"
+msgstr "Draw Calls"
+
+#: callmapview.cpp:321 treemap.cpp:2889
+msgid "Shading"
+msgstr "Shading"
+
+#: callmapview.cpp:431
+msgid "Call Map: Current is '%1'"
+msgstr "Call Map: Current is '%1'"
+
+#: callmapview.cpp:599
+msgid "(no function)"
+msgstr "(no function)"
+
+#: callmapview.cpp:741 callmapview.cpp:858
+msgid "(no call)"
+msgstr "(no call)"
 
 #. i18n: file dumpselectionbase.ui line 917
 #: costtypeview.cpp:43 coverageview.cpp:46 partview.cpp:47 rc.cpp:267
@@ -296,6 +717,20 @@ msgstr "Event Type"
 msgid "Incl."
 msgstr "Incl."
 
+#: coverageview.cpp:48 coverageview.cpp:54
+msgid "Distance"
+msgstr "Distance"
+
+#. i18n: file dumpselectionbase.ui line 928
+#: coverageview.cpp:49 partview.cpp:49 rc.cpp:270 rc.cpp:315
+#, no-c-format
+msgid "Called"
+msgstr "Called"
+
+#: callview.cpp:48 coverageview.cpp:50
+msgid "Caller"
+msgstr "Caller"
+
 #. i18n: file functionselectionbase.ui line 62
 #: costtypeview.cpp:44 coverageview.cpp:53 partview.cpp:48 rc.cpp:303
 #: rc.cpp:312
@@ -303,90 +738,319 @@ msgstr "Incl."
 msgid "Self"
 msgstr "Self"
 
-#: costtypeview.cpp:45
-msgid "Short"
-msgstr "Short"
+#: coverageview.cpp:55
+msgid "Calling"
+msgstr "Calling"
 
-#: costtypeview.cpp:47
-msgid "Formula"
-msgstr "Formula"
+#: callview.cpp:52 coverageview.cpp:56
+msgid "Callee"
+msgstr "Callee"
 
-#: costtypeview.cpp:81
+#: coverageview.cpp:90
 msgid ""
-"<b>Cost Types List</b>"
-"<p>This list shows all cost types available and what the self/inclusive cost of "
-"the current selected function is for that cost type.</p>"
-"<p>By choosing a cost type from the list, you change the cost type of costs "
-"shown all over KCachegrind to be the selected one.</p>"
+"<b>List of all Callers</b>"
+"<p>This list shows all functions calling the current selected one, either "
+"directly or with several functions in-between on the stack; the number of "
+"functions in-between plus one is called the <em>Distance</em> "
+"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
+"calls C, i.e. A => B => C. The distance here is 2).</p>"
+"<p>Absolute cost shown is the cost spent in the selected function while a "
+"listed function is active; relative cost is the percentage of all cost spent in "
+"the selected function while the listed one is active. The cost graphic shows "
+"logarithmic percentage with a different color for each distance.</p>"
+"<p>As there can be many calls from the same function, the distance column "
+"sometimes shows the range of distances for all calls happening; then, in "
+"parentheses, there is the medium distance, i.e. the distance where most of the "
+"call costs happened.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 msgstr ""
-"<b>Cost Types List</b>"
-"<p>This list shows all cost types available and what the self/inclusive cost of "
-"the current selected function is for that cost type.</p>"
-"<p>By choosing a cost type from the list, you change the cost type of costs "
-"shown all over KCachegrind to be the selected one.</p>"
+"<b>List of all Callers</b>"
+"<p>This list shows all functions calling the current selected one, either "
+"directly or with several functions in-between on the stack; the number of "
+"functions in-between plus one is called the <em>Distance</em> "
+"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
+"calls C, i.e. A => B => C. The distance here is 2).</p>"
+"<p>Absolute cost shown is the cost spent in the selected function while a "
+"listed function is active; relative cost is the percentage of all cost spent in "
+"the selected function while the listed one is active. The cost graphic shows "
+"logarithmic percentage with a different colour for each distance.</p>"
+"<p>As there can be many calls from the same function, the distance column "
+"sometimes shows the range of distances for all calls happening; then, in "
+"brackets, there is the medium distance, i.e. the distance where most of the "
+"call costs happened.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 
-#: costtypeview.cpp:98
-msgid "Set Secondary Event Type"
-msgstr "Set Secondary Event Type"
+#: coverageview.cpp:120
+msgid ""
+"<b>List of all Callees</b>"
+"<p>This list shows all functions called by the current selected one, either "
+"directly or with several function in-between on the stack; the number of "
+"function in-between plus one is called the <em>Distance</em> "
+"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
+"calls C, i.e. A => B => C. The distance here is 2).</p>"
+"<p>Absolute cost shown is the cost spent in the listed function while the "
+"selected is active; relative cost is the percentage of all cost spent in the "
+"listed function while the selected one is active. The cost graphic always shows "
+"logarithmic percentage with a different color for each distance.</p>"
+"<p>As there can be many calls to the same function, the distance column "
+"sometimes shows the range of distances for all calls happening; then, in "
+"parentheses, there is the medium distance, i.e. the distance where most of the "
+"call costs happened.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
+msgstr ""
+"<b>List of all Callees</b>"
+"<p>This list shows all functions called by the current selected one, either "
+"directly or with several function in-between on the stack; the number of "
+"function in-between plus one is called the <em>Distance</em> "
+"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
+"calls C, i.e. A => B => C. The distance here is 2).</p>"
+"<p>Absolute cost shown is the cost spent in the listed function while the "
+"selected is active; relative cost is the percentage of all cost spent in the "
+"listed function while the selected one is active. The cost graphic always shows "
+"logarithmic percentage with a different colour for each distance.</p>"
+"<p>As there can be many calls to the same function, the distance column "
+"sometimes shows the range of distances for all calls happening; then, in "
+"brackets, there is the medium distance, i.e. the distance where most of the "
+"call costs happened.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 
-#: costtypeview.cpp:100
-msgid "Remove Secondary Event Type"
-msgstr "Remove Secondary Event Type"
+#: callgraphview.cpp:2396 callgraphview.cpp:2400 callgraphview.cpp:2418
+#: callview.cpp:123 callview.cpp:128 coverageview.cpp:166 instrview.cpp:191
+#: sourceview.cpp:116
+msgid "Go to '%1'"
+msgstr "Go to '%1'"
 
-#: costtypeview.cpp:105
-msgid "Edit Long Name"
-msgstr "Edit Long Name"
+#: callview.cpp:45 instrview.cpp:127 sourceview.cpp:52
+msgid "Cost 2"
+msgstr "Cost 2"
 
-#: costtypeview.cpp:106
-msgid "Edit Short Name"
-msgstr "Edit Short Name"
+#: callview.cpp:47 callview.cpp:51
+msgid "Count"
+msgstr "Count"
 
-#: costtypeview.cpp:107
-msgid "Edit Formula"
-msgstr "Edit Formula"
+#: callview.cpp:85
+msgid ""
+"<b>List of direct Callers</b>"
+"<p>This list shows all functions calling the current selected one directly, "
+"together with a call count and the cost spent in the current selected function "
+"while being called from the function from the list.</p>"
+"<p>An icon instead of an inclusive cost specifies that this is a call inside of "
+"a recursive cycle. An inclusive cost makes no sense here.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
+msgstr ""
+"<b>List of direct Callers</b>"
+"<p>This list shows all functions calling the current selected one directly, "
+"together with a call count and the cost spent in the current selected function "
+"while being called from the function from the list.</p>"
+"<p>An icon instead of an inclusive cost specifies that this is a call inside of "
+"a recursive cycle. An inclusive cost makes no sense here.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 
-#: costtypeview.cpp:115
-msgid "New Cost Type ..."
-msgstr "New Cost Type ..."
+#: callview.cpp:98
+msgid ""
+"<b>List of direct Callees</b>"
+"<p>This list shows all functions called by the current selected one directly, "
+"together with a call count and the cost spent in this function while being "
+"called from the selected function.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
+msgstr ""
+"<b>List of direct Callees</b>"
+"<p>This list shows all functions called by the current selected one directly, "
+"together with a call count and the cost spent in this function while being "
+"called from the selected function.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 
-#: costtypeview.cpp:149 costtypeview.cpp:154
-#, c-format
-msgid "New%1"
-msgstr "New%1"
+#: instritem.cpp:106 sourceitem.cpp:86
+msgid "Active call to '%1'"
+msgstr "Active call to '%1'"
 
-#: costtypeview.cpp:155
-#, c-format
-msgid "New Cost Type %1"
-msgstr "New Cost Type %1"
+#: instritem.cpp:108 sourceitem.cpp:88
+msgid ""
+"_n: %n call to '%1'\n"
+"%n calls to '%1'"
+msgstr ""
+"%n call to '%1'\n"
+"%n calls to '%1'"
 
-#: sourceitem.cpp:125
-msgid "Jump %1 of %2 times to %3"
-msgstr "Jump %1 of %2 times to %3"
+#: instritem.cpp:137
+msgid "Jump %1 of %2 times to 0x%3"
+msgstr "Jump %1 of %2 times to 0x%3"
 
-#: sourceitem.cpp:130
-msgid "Jump %1 times to %2"
-msgstr "Jump %1 times to %2"
+#: instritem.cpp:142
+msgid "Jump %1 times to 0x%2"
+msgstr "Jump %1 times to 0x%2"
 
-#: costlistitem.cpp:60
-#, c-format
-msgid ""
-"_n: (%n item skipped)\n"
-"(%n items skipped)"
-msgstr ""
-"(%n item skipped)\n"
-"(%n items skipped)"
+#: instritem.cpp:185 sourceitem.cpp:169
+msgid "(cycle)"
+msgstr "(cycle)"
 
-#: traceitemview.cpp:53
-msgid "No description available"
-msgstr "No description available"
+#: tracedata.cpp:153
+msgid "Abstract Item"
+msgstr "Abstract Item"
+
+#: tracedata.cpp:154
+msgid "Cost Item"
+msgstr "Cost Item"
+
+#: tracedata.cpp:155
+msgid "Part Source Line"
+msgstr "Part Source Line"
+
+#: tracedata.cpp:156
+msgid "Source Line"
+msgstr "Source Line"
+
+#: tracedata.cpp:157
+msgid "Part Line Call"
+msgstr "Part Line Call"
+
+#: tracedata.cpp:158
+msgid "Line Call"
+msgstr "Line Call"
+
+#: tracedata.cpp:159
+msgid "Part Jump"
+msgstr "Part Jump"
+
+#: tracedata.cpp:160
+msgid "Jump"
+msgstr "Jump"
+
+#: tracedata.cpp:161
+msgid "Part Instruction"
+msgstr "Part Instruction"
+
+#: tracedata.cpp:162
+msgid "Instruction"
+msgstr "Instruction"
+
+#: tracedata.cpp:163
+msgid "Part Instruction Jump"
+msgstr "Part Instruction Jump"
+
+#: tracedata.cpp:164
+msgid "Instruction Jump"
+msgstr "Instruction Jump"
+
+#: tracedata.cpp:165
+msgid "Part Instruction Call"
+msgstr "Part Instruction Call"
+
+#: tracedata.cpp:166
+msgid "Instruction Call"
+msgstr "Instruction Call"
+
+#: tracedata.cpp:167
+msgid "Part Call"
+msgstr "Part Call"
+
+#: tracedata.cpp:168
+msgid "Call"
+msgstr "Call"
+
+#: tracedata.cpp:169
+msgid "Part Function"
+msgstr "Part Function"
+
+#: tracedata.cpp:170
+msgid "Function Source File"
+msgstr "Function Source File"
+
+#. i18n: file dumpselectionbase.ui line 300
+#: rc.cpp:144 rc.cpp:273 rc.cpp:318 rc.cpp:342 tracedata.cpp:171
+#, no-c-format
+msgid "Function"
+msgstr "Function"
+
+#: tracedata.cpp:172
+msgid "Function Cycle"
+msgstr "Function Cycle"
+
+#: tracedata.cpp:173
+msgid "Part Class"
+msgstr "Part Class"
+
+#: tracedata.cpp:174
+msgid "Class"
+msgstr "Class"
+
+#: tracedata.cpp:175
+msgid "Part Source File"
+msgstr "Part Source File"
+
+#: tracedata.cpp:176
+msgid "Source File"
+msgstr "Source File"
+
+#: tracedata.cpp:177
+msgid "Part ELF Object"
+msgstr "Part ELF Object"
+
+#: tracedata.cpp:178
+msgid "ELF Object"
+msgstr "ELF Object"
+
+#: partview.cpp:46 tracedata.cpp:179
+msgid "Profile Part"
+msgstr "Profile Part"
+
+#: tracedata.cpp:180
+msgid "Program Trace"
+msgstr "Program Trace"
+
+#: tracedata.cpp:241
+msgid "%1 from %2"
+msgstr "%1 from %2"
+
+#: partgraph.cpp:423 tracedata.cpp:249 tracedata.cpp:254 tracedata.cpp:2824
+#: tracedata.cpp:3241 tracedata.cpp:3327 tracedata.cpp:4165 tracedata.cpp:4173
+#: tracedata.cpp:4238
+msgid "(unknown)"
+msgstr "(unknown)"
+
+#: tracedata.cpp:2583
+msgid "(no caller)"
+msgstr "(no caller)"
+
+#: tracedata.cpp:2590 tracedata.cpp:2609
+msgid "%1 via %2"
+msgstr "%1 via %2"
+
+#: tracedata.cpp:2599
+msgid "(no callee)"
+msgstr "(no callee)"
+
+#: tracedata.cpp:4467
+msgid "(not found)"
+msgstr "(not found)"
+
+#: tracedata.cpp:5017
+msgid "Recalculating Function Cycles..."
+msgstr "Recalculating Function Cycles..."
 
 #. i18n: file partselectionbase.ui line 16
-#: rc.cpp:324 toplevel.cpp:281 toplevel.cpp:581
+#: rc.cpp:324 toplevel.cpp:276 toplevel.cpp:576
 #, no-c-format
 msgid "Parts Overview"
 msgstr "Parts Overview"
 
-#: toplevel.cpp:288
+#: toplevel.cpp:283
 msgid ""
 "<b>The Parts Overview</b>"
 "<p>A trace consists of multiple trace parts when there are several profile data "
@@ -422,11 +1086,11 @@ msgstr ""
 "function in the trace part is shown. This is split up into smaller rectangles "
 "to show the costs of its callees.</li></ul></p>"
 
-#: toplevel.cpp:318
+#: toplevel.cpp:313
 msgid "Top Cost Call Stack"
 msgstr "Top Cost Call Stack"
 
-#: toplevel.cpp:320
+#: toplevel.cpp:315
 msgid ""
 "<b>The Top Cost Call Stack</b>"
 "<p>This is a purely fictional 'most probable' call stack. It is built up by "
@@ -442,11 +1106,11 @@ msgstr ""
 "<p>The <b>Cost</b> and <b>Calls</b> columns show the cost used for all calls "
 "from the function in the line above.</p>"
 
-#: toplevel.cpp:333
+#: toplevel.cpp:328
 msgid "Flat Profile"
 msgstr "Flat Profile"
 
-#: toplevel.cpp:343
+#: toplevel.cpp:338
 msgid ""
 "<b>The Flat Profile</b>"
 "<p>The flat profile contains a group and a function selection list. The group "
@@ -467,12 +1131,12 @@ msgstr ""
 "costs less than 1% are hidden on default.</p>"
 
 #. i18n: file dumpselectionbase.ui line 16
-#: rc.cpp:84 toplevel.cpp:357 toplevel.cpp:609
+#: rc.cpp:84 toplevel.cpp:352 toplevel.cpp:604
 #, no-c-format
 msgid "Profile Dumps"
 msgstr "Profile Dumps"
 
-#: toplevel.cpp:367
+#: toplevel.cpp:362
 msgid ""
 "<b>Profile Dumps</b>"
 "<p>This dockable shows in the top part the list of loadable profile dumps in "
@@ -524,11 +1188,11 @@ msgstr ""
 "option to let the dockable activate the top function in the current loaded "
 "dump.</ul></p>"
 
-#: toplevel.cpp:455
+#: toplevel.cpp:450
 msgid "&Duplicate"
 msgstr "&Duplicate"
 
-#: toplevel.cpp:459
+#: toplevel.cpp:454
 msgid ""
 "<b>Duplicate Current Layout</b>"
 "<p>Make a copy of the current layout.</p>"
@@ -536,7 +1200,7 @@ msgstr ""
 "<b>Duplicate Current Layout</b>"
 "<p>Make a copy of the current layout.</p>"
 
-#: toplevel.cpp:466
+#: toplevel.cpp:461
 msgid ""
 "<b>Remove Current Layout</b>"
 "<p>Delete current layout and make the previous active.</p>"
@@ -544,47 +1208,47 @@ msgstr ""
 "<b>Remove Current Layout</b>"
 "<p>Delete current layout and make the previous active.</p>"
 
-#: toplevel.cpp:470
+#: toplevel.cpp:465
 msgid "&Go to Next"
 msgstr "&Go to Next"
 
-#: toplevel.cpp:474
+#: toplevel.cpp:469
 msgid "Go to Next Layout"
 msgstr "Go to Next Layout"
 
-#: toplevel.cpp:477
+#: toplevel.cpp:472
 msgid "&Go to Previous"
 msgstr "&Go to Previous"
 
-#: toplevel.cpp:481
+#: toplevel.cpp:476
 msgid "Go to Previous Layout"
 msgstr "Go to Previous Layout"
 
-#: toplevel.cpp:484
+#: toplevel.cpp:479
 msgid "&Restore to Default"
 msgstr "&Restore to Default"
 
-#: toplevel.cpp:487
+#: toplevel.cpp:482
 msgid "Restore Layouts to Default"
 msgstr "Restore Layouts to Default"
 
-#: toplevel.cpp:490
+#: toplevel.cpp:485
 msgid "&Save as Default"
 msgstr "&Save as Default"
 
-#: toplevel.cpp:493
+#: toplevel.cpp:488
 msgid "Save Layouts as Default"
 msgstr "Save Layouts as Default"
 
-#: toplevel.cpp:504
+#: toplevel.cpp:499
 msgid "<b>New</b><p>Open new empty KCachegrind window.</p>"
 msgstr "<b>New</b><p>Open new empty KCachegrind window.</p>"
 
-#: toplevel.cpp:507
+#: toplevel.cpp:502
 msgid "&Add..."
 msgstr "&Add..."
 
-#: toplevel.cpp:510
+#: toplevel.cpp:505
 msgid ""
 "<b>Add Profile Data</b>"
 "<p>This opens an additional profile data file in the current window.</p>"
@@ -592,17 +1256,17 @@ msgstr ""
 "<b>Add Profile Data</b>"
 "<p>This opens an additional profile data file in the current window.</p>"
 
-#: toplevel.cpp:522
+#: toplevel.cpp:517
 msgid "<b>Reload Profile Data</b><p>This loads any new created parts, too.</p>"
 msgstr ""
 "<b>Reload Profile Data</b>"
 "<p>This loads any new created parts, too.</p>"
 
-#: toplevel.cpp:526
+#: toplevel.cpp:521
 msgid "&Export Graph"
 msgstr "&Export Graph"
 
-#: toplevel.cpp:530
+#: toplevel.cpp:525
 msgid ""
 "<b>Export Call Graph</b>"
 "<p>Generates a file with extension .dot for the tools of the GraphViz "
@@ -612,11 +1276,11 @@ msgstr ""
 "<p>Generates a file with extension .dot for the tools of the GraphViz "
 "package.</p>"
 
-#: toplevel.cpp:536
+#: toplevel.cpp:531
 msgid "&Force Dump"
 msgstr "&Force Dump"
 
-#: toplevel.cpp:545
+#: toplevel.cpp:540
 msgid ""
 "<b>Force Dump</b>"
 "<p>This forces a dump for a Callgrind profile run in the current directory. "
@@ -650,7 +1314,7 @@ msgstr ""
 "sleeping. Tip: For a profiled GUI program, you can awake Callgrind e.g. by "
 "resizing a window of the program.</p>"
 
-#: toplevel.cpp:570
+#: toplevel.cpp:565
 msgid ""
 "<b>Open Profile Data</b>"
 "<p>This opens a profile data file, with possible multiple parts</p>"
@@ -658,53 +1322,53 @@ msgstr ""
 "<b>Open Profile Data</b>"
 "<p>This opens a profile data file, with possible multiple parts</p>"
 
-#: toplevel.cpp:586
+#: toplevel.cpp:581
 msgid "Show/Hide the Parts Overview Dockable"
 msgstr "Show/Hide the Parts Overview Dockable"
 
-#: toplevel.cpp:590
+#: toplevel.cpp:585
 msgid "Call Stack"
 msgstr "Call Stack"
 
-#: toplevel.cpp:595
+#: toplevel.cpp:590
 msgid "Show/Hide the Call Stack Dockable"
 msgstr "Show/Hide the Call Stack Dockable"
 
 #. i18n: file functionselectionbase.ui line 16
-#: rc.cpp:297 toplevel.cpp:599
+#: rc.cpp:297 toplevel.cpp:594
 #, no-c-format
 msgid "Function Profile"
 msgstr "Function Profile"
 
-#: toplevel.cpp:604
+#: toplevel.cpp:599
 msgid "Show/Hide the Function Profile Dockable"
 msgstr "Show/Hide the Function Profile Dockable"
 
-#: toplevel.cpp:614
+#: toplevel.cpp:609
 msgid "Show/Hide the Profile Dumps Dockable"
 msgstr "Show/Hide the Profile Dumps Dockable"
 
-#: toplevel.cpp:619
+#: toplevel.cpp:614
 msgid "Show Relative Costs"
 msgstr "Show Relative Costs"
 
-#: toplevel.cpp:626
+#: toplevel.cpp:621
 msgid "Show Absolute Costs"
 msgstr "Show Absolute Costs"
 
-#: toplevel.cpp:629
+#: toplevel.cpp:624
 msgid "Show relative instead of absolute costs"
 msgstr "Show relative instead of absolute costs"
 
-#: toplevel.cpp:633
+#: toplevel.cpp:628
 msgid "Percentage Relative to Parent"
 msgstr "Percentage Relative to Parent"
 
-#: toplevel.cpp:639
+#: toplevel.cpp:634
 msgid "Show percentage costs relative to parent"
 msgstr "Show percentage costs relative to parent"
 
-#: toplevel.cpp:643
+#: toplevel.cpp:638
 msgid ""
 "<b>Show percentage costs relative to parent</b>"
 "<p>If this is switched off, percentage costs are always shown relative to the "
@@ -754,15 +1418,15 @@ msgstr ""
 "<td>Function Cumulative</td></tr></table>"
 "<p>(*) Only if function grouping is switched on (e.g. ELF object grouping)."
 
-#: toplevel.cpp:658
+#: toplevel.cpp:653
 msgid "Do Cycle Detection"
 msgstr "Do Cycle Detection"
 
-#: toplevel.cpp:664
+#: toplevel.cpp:659
 msgid "Skip Cycle Detection"
 msgstr "Skip Cycle Detection"
 
-#: toplevel.cpp:667
+#: toplevel.cpp:662
 msgid ""
 "<b>Detect recursive cycles</b>"
 "<p>If this is switched off, the treemap drawing will show black areas when a "
@@ -788,15 +1452,15 @@ msgstr ""
 "cycles, making the analysis impossible; therefore, there is the option to "
 "switch this off."
 
-#: toplevel.cpp:689 toplevel.cpp:729
+#: toplevel.cpp:684 toplevel.cpp:724
 msgid "Go back in function selection history"
 msgstr "Go back in function selection history"
 
-#: toplevel.cpp:695 toplevel.cpp:741
+#: toplevel.cpp:690 toplevel.cpp:736
 msgid "Go forward in function selection history"
 msgstr "Go forwards in function selection history"
 
-#: toplevel.cpp:701 toplevel.cpp:715
+#: toplevel.cpp:696 toplevel.cpp:710
 msgid ""
 "<b>Go Up</b>"
 "<p>Go to last selected caller of current function. If no caller was visited, "
@@ -806,63 +1470,65 @@ msgstr ""
 "<p>Go to last selected caller of current function. If no caller was visited, "
 "use that with highest cost.</p>"
 
-#: toplevel.cpp:707
+#: toplevel.cpp:702
 msgid "&Up"
 msgstr "&Up"
 
-#: toplevel.cpp:746 toplevel.cpp:1651
+#: toplevel.cpp:741 toplevel.cpp:1646
 msgid "Primary Event Type"
 msgstr "Primary Event Type"
 
-#: toplevel.cpp:748
+#: toplevel.cpp:743
 msgid "Select primary event type of costs"
 msgstr "Select primary event type of costs"
 
-#: toplevel.cpp:758 toplevel.cpp:1654
+#: toplevel.cpp:753 toplevel.cpp:1649
 msgid "Secondary Event Type"
 msgstr "Secondary Event Type"
 
-#: toplevel.cpp:760
+#: toplevel.cpp:755
 msgid "Select secondary event type for cost e.g. shown in annotations"
 msgstr "Select secondary event type for cost e.g. shown in annotations"
 
-#: functionselection.cpp:243 toplevel.cpp:768
+#: functionselection.cpp:243 toplevel.cpp:763
 msgid "Grouping"
 msgstr "Grouping"
 
-#: toplevel.cpp:771
+#: toplevel.cpp:766
 msgid "Select how functions are grouped into higher level cost items"
 msgstr "Select how functions are grouped into higher level cost items"
 
-#: functionselection.cpp:52 toplevel.cpp:777
+#: functionselection.cpp:52 toplevel.cpp:772
 msgid "(No Grouping)"
 msgstr "(No Grouping)"
 
-#: toplevel.cpp:787
+#: toplevel.cpp:782
 msgid "Split"
 msgstr "Split"
 
-#: toplevel.cpp:791
+#: toplevel.cpp:786
 msgid "Show two information panels"
 msgstr "Show two information panels"
 
-#: toplevel.cpp:795
-msgid "Split Horizontal"
+#: toplevel.cpp:790
+#, fuzzy
+msgid "SplitQt::Horizontal"
 msgstr "Split Horizontal"
 
-#: toplevel.cpp:800
-msgid "Change Split Orientation when main window is split."
+#: toplevel.cpp:795
+#, fuzzy
+msgid "Change Split Qt::Orientation when main window is split."
 msgstr "Change Split Orientation when main window is split."
 
-#: toplevel.cpp:808
+#: toplevel.cpp:803
 msgid "Tip of the &Day..."
 msgstr "Tip of the &Day..."
 
-#: toplevel.cpp:809
+#: toplevel.cpp:804
 msgid "Show \"Tip of the Day\""
 msgstr "Show \"Tip of the Day\""
 
-#: toplevel.cpp:1012 toplevel.cpp:1061
+#: toplevel.cpp:1007 toplevel.cpp:1056
 msgid ""
 "cachegrind.out* callgrind.out*|Callgrind Profile Data\n"
 "*|All Files"
@@ -870,670 +1536,157 @@ msgstr ""
 "cachegrind.out* callgrind.out*|Callgrind Profile Data\n"
 "*|All Files"
 
-#: toplevel.cpp:1014
+#: toplevel.cpp:1009
 msgid "Select Callgrind Profile Data"
 msgstr "Select Callgrind Profile Data"
 
-#: toplevel.cpp:1063
+#: toplevel.cpp:1058
 msgid "Add Callgrind Profile Data"
 msgstr "Add Callgrind Profile Data"
 
-#: toplevel.cpp:1221 toplevel.cpp:1574
+#: toplevel.cpp:1216 toplevel.cpp:1569
 msgid "(Hidden)"
 msgstr "(Hidden)"
 
-#: toplevel.cpp:1626
+#: toplevel.cpp:1621
 msgid "Hide"
 msgstr "Hide"
 
-#: toplevel.cpp:1659
+#: toplevel.cpp:1654
 msgid "Show Absolute Cost"
 msgstr "Show Absolute Cost"
 
-#: toplevel.cpp:1662
+#: toplevel.cpp:1657
 msgid "Show Relative Cost"
 msgstr "Show Relative Cost"
 
-#: toplevel.cpp:1693
+#: toplevel.cpp:1688
 msgid "Go Forward"
 msgstr "Go Forward"
 
-#: toplevel.cpp:1694
+#: toplevel.cpp:1689
 msgid "Go Up"
 msgstr "Go Up"
 
-#: toplevel.cpp:1926
+#: toplevel.cpp:1921
 #, c-format
 msgid "Layout Count: %1"
 msgstr "Layout Count: %1"
 
-#: toplevel.cpp:1933
+#: toplevel.cpp:1928
 msgid "No profile data file loaded."
 msgstr "No profile data file loaded."
 
-#: toplevel.cpp:1942
+#: toplevel.cpp:1937
 msgid "Total %1 Cost: %2"
 msgstr "Total %1 Cost: %2"
 
-#: toplevel.cpp:1954
+#: toplevel.cpp:1949
 msgid "No event type selected"
 msgstr "No event type selected"
 
-#: toplevel.cpp:2199 toplevel.cpp:2235 toplevel.cpp:2271
+#: toplevel.cpp:2194 toplevel.cpp:2230 toplevel.cpp:2266
 msgid "(No Stack)"
 msgstr "(No Stack)"
 
-#: toplevel.cpp:2205
+#: toplevel.cpp:2200
 msgid "(No next function)"
 msgstr "(No next function)"
 
-#: toplevel.cpp:2241
+#: toplevel.cpp:2236
 msgid "(No previous function)"
 msgstr "(No previous function)"
 
-#: toplevel.cpp:2276
+#: toplevel.cpp:2271
 msgid "(No Function Up)"
 msgstr "(No Function Up)"
 
-#. i18n: file dumpselectionbase.ui line 906
-#: instrview.cpp:125 rc.cpp:264 sourceview.cpp:50
-#, no-c-format
-msgid "#"
-msgstr "No."
-
-#: callview.cpp:45 instrview.cpp:127 sourceview.cpp:52
-msgid "Cost 2"
-msgstr "Cost 2"
-
-#: instrview.cpp:129
-msgid "Hex"
-msgstr "Hex"
-
-#: instrview.cpp:131 tabview.cpp:313
-msgid "Assembler"
-msgstr "Assembler"
-
-#: instrview.cpp:132
-msgid "Source Position"
-msgstr "Source Position"
-
-#: instrview.cpp:163
-msgid ""
-"<b>Annotated Assembler</b>"
-"<p>The annotated assembler list shows the machine code instructions of the "
-"current selected function together with (self) cost spent while executing an "
-"instruction. If this is a call instruction, lines with details on the call "
-"happening are inserted into the source: the cost spent inside of the call, the "
-"number of calls happening, and the call destination.</p>"
-"<p>The disassembler output shown is generated with the 'objdump' utility from "
-"the 'binutils' package.</p>"
-"<p>Select a line with call information to make the destination function of this "
-"call current.</p>"
-msgstr ""
-"<b>Annotated Assembler</b>"
-"<p>The annotated assembler list shows the machine code instructions of the "
-"current selected function together with (self) cost spent while executing an "
-"instruction. If this is a call instruction, lines with details on the call "
-"happening are inserted into the source: the cost spent inside of the call, the "
-"number of calls happening, and the call destination.</p>"
-"<p>The disassembler output shown is generated with the 'objdump' utility from "
-"the 'binutils' package.</p>"
-"<p>Select a line with call information to make the destination function of this "
-"call current.</p>"
-
-#: callgraphview.cpp:2397 callgraphview.cpp:2401 callgraphview.cpp:2419
-#: callview.cpp:123 callview.cpp:128 coverageview.cpp:166 instrview.cpp:191
-#: sourceview.cpp:116
-msgid "Go to '%1'"
-msgstr "Go to '%1'"
-
-#: instrview.cpp:195
-#, c-format
-msgid "Go to Address %1"
-msgstr "Go to Address %1"
-
-#: instrview.cpp:207
-msgid "Hex Code"
-msgstr "Hex Code"
-
-#: instrview.cpp:426
-msgid "There is no instruction info in the profile data file."
-msgstr "There is no instruction info in the profile data file."
-
-#: instrview.cpp:428
-msgid "For the Valgrind Calltree Skin, rerun with option"
-msgstr "For the Valgrind Calltree Skin, rerun with option"
-
-#: instrview.cpp:429
-msgid "      --dump-instr=yes"
-msgstr "      --dump-instr=yes"
-
-#: instrview.cpp:430
-msgid "To see (conditional) jumps, additionally specify"
-msgstr "To see (conditional) jumps, additionally specify"
-
-#: instrview.cpp:431
-msgid "      --trace-jump=yes"
-msgstr "      --trace-jump=yes"
-
-#: instrview.cpp:629
-msgid "There is an error trying to execute the command"
-msgstr "There is an error trying to execute the command"
-
-#: instrview.cpp:634 instrview.cpp:900
-msgid "Check that you have installed 'objdump'."
-msgstr "Check that you have installed 'objdump'."
-
-#: instrview.cpp:636 instrview.cpp:902
-msgid "This utility can be found in the 'binutils' package."
-msgstr "This utility can be found in the 'binutils' package."
-
-#: instrview.cpp:739
-msgid "(No Assembler)"
-msgstr "(No Assembler)"
-
-#: instrview.cpp:875
-#, c-format
-msgid ""
-"_n: There is %n cost line without assembler code.\n"
-"There are %n cost lines without assembler code."
-msgstr ""
-"There is %n cost line without assembler code.\n"
-"There are %n cost lines without assembler code."
-
-#: instrview.cpp:877
-msgid "This happens because the code of"
-msgstr "This happens because the code of"
-
-#: instrview.cpp:880
-msgid "does not seem to match the profile data file."
-msgstr "does not seem to match the profile data file."
-
-#: instrview.cpp:883
-msgid "Are you using an old profile data file or is the above mentioned"
-msgstr "Are you using an old profile data file or is the above mentioned"
-
-#: instrview.cpp:885
-msgid "ELF object from an updated installation/another machine?"
-msgstr "ELF object from an updated installation/another machine?"
-
-#: instrview.cpp:893
-msgid "There seems to be an error trying to execute the command"
-msgstr "There seems to be an error trying to execute the command"
-
-#: instrview.cpp:898
-msgid "Check that the ELF object used in the command exists."
-msgstr "Check that the ELF object used in the command exists."
-
-#: callgraphview.cpp:306
-#, c-format
-msgid "Call(s) from %1"
-msgstr "Call(s) from %1"
-
-#: callgraphview.cpp:307
+#: costlistitem.cpp:60
 #, c-format
-msgid "Call(s) to %1"
-msgstr "Call(s) to %1"
-
-#: callgraphview.cpp:308
-msgid "(unknown call)"
-msgstr "(unknown call)"
-
-#: callgraphview.cpp:1425
-msgid ""
-"<b>Call Graph around active Function</b>"
-"<p>Depending on configuration, this view shows the call graph environment of "
-"the active function. Note: the shown cost is <b>only</b> "
-"the cost which is spent while the active function was actually running; i.e. "
-"the cost shown for main() - if it's visible - should be the same as the cost of "
-"the active function, as that's the part of inclusive cost of main() spent while "
-"the active function was running.</p>"
-"<p>For cycles, blue call arrows indicate that this is an artificial call added "
-"for correct drawing which actually never happened.</p>"
-"<p>If the graph is larger than the widget area, an overview panner is shown in "
-"one edge. There are similar visualization options to the Call Treemap; the "
-"selected function is highlighted."
-"<p>"
-msgstr ""
-"<b>Call Graph around active Function</b>"
-"<p>Depending on configuration, this view shows the call graph environment of "
-"the active function. Note: the shown cost is <b>only</b> "
-"the cost which is spent while the active function was actually running; i.e. "
-"the cost shown for main() - if it's visible - should be the same as the cost of "
-"the active function, as that's the part of inclusive cost of main() spent while "
-"the active function was running.</p>"
-"<p>For cycles, blue call arrows indicate that this is an artificial call added "
-"for correct drawing which actually never happened.</p>"
-"<p>If the graph is larger than the widget area, an overview panner is shown in "
-"one edge. There are similar visualising options to the Call Treemap; the "
-"selected function is highlighted."
-"<p>"
-
-#: callgraphview.cpp:1789
-msgid ""
-"Warning: a long lasting graph layouting is in progress.\n"
-"Reduce node/edge limits for speedup.\n"
-msgstr ""
-"Warning: a long lasting graph layouting is in progress.\n"
-"Reduce node/edge limits for speedup.\n"
-
-#: callgraphview.cpp:1792
-msgid ""
-"Layouting stopped.\n"
-msgstr ""
-"Layouting stopped.\n"
-
-#: callgraphview.cpp:1794
 msgid ""
-"The call graph has %1 nodes and %2 edges.\n"
+"_n: (%n item skipped)\n"
+"(%n items skipped)"
 msgstr ""
-"The call graph has %1 nodes and %2 edges.\n"
+"(%n item skipped)\n"
+"(%n items skipped)"
 
-#: callgraphview.cpp:1827
-msgid "No item activated for which to draw the call graph."
-msgstr "No item activated for which to draw the call graph."
+#: sourceitem.cpp:125
+msgid "Jump %1 of %2 times to %3"
+msgstr "Jump %1 of %2 times to %3"
 
-#: callgraphview.cpp:1838
-msgid "No call graph can be drawn for the active item."
-msgstr "No call graph can be drawn for the active item."
+#: sourceitem.cpp:130
+msgid "Jump %1 times to %2"
+msgstr "Jump %1 times to %2"
 
-#: callgraphview.cpp:1867
-msgid ""
-"No call graph is available because the following\n"
-"command cannot be run:\n"
-"'%1'\n"
-msgstr ""
-"No call graph is available because the following\n"
-"command cannot be run:\n"
-"'%1'\n"
+#: costtypeview.cpp:42
+msgid "Event Type"
+msgstr "Event Type"
 
-#: callgraphview.cpp:1870 callgraphview.cpp:2200
-msgid "Please check that 'dot' is installed (package GraphViz)."
-msgstr "Please check that 'dot' is installed (package GraphViz)."
+#: costtypeview.cpp:45
+msgid "Short"
+msgstr "Short"
 
-#: callgraphview.cpp:2199
-msgid ""
-"Error running the graph layouting tool.\n"
-msgstr ""
-"Error running the graph layouting tool.\n"
+#: costtypeview.cpp:47
+msgid "Formula"
+msgstr "Formula"
 
-#: callgraphview.cpp:2207
+#: costtypeview.cpp:81
 msgid ""
-"There is no call graph available for function\n"
-"\t'%1'\n"
-"because it has no cost of the selected event type."
+"<b>Cost Types List</b>"
+"<p>This list shows all cost types available and what the self/inclusive cost of "
+"the current selected function is for that cost type.</p>"
+"<p>By choosing a cost type from the list, you change the cost type of costs "
+"shown all over KCachegrind to be the selected one.</p>"
 msgstr ""
-"There is no call graph available for function\n"
-"\t'%1'\n"
-"because it has no cost of the selected event type."
-
-#: callgraphview.cpp:2428
-msgid "Stop Layouting"
-msgstr "Stop Layouting"
-
-#: callgraphview.cpp:2436
-msgid "As PostScript"
-msgstr "As PostScript"
-
-#: callgraphview.cpp:2437
-msgid "As Image ..."
-msgstr "As Image ..."
-
-#: callgraphview.cpp:2439
-msgid "Export Graph"
-msgstr "Export Graph"
-
-#: callgraphview.cpp:2444 callgraphview.cpp:2467
-msgid "Unlimited"
-msgstr "Unlimited"
-
-#: callgraphview.cpp:2447 callgraphview.cpp:2470
-msgid "None"
-msgstr "None"
-
-#: callgraphview.cpp:2448 callgraphview.cpp:2471
-msgid "max. 2"
-msgstr "max. 2"
-
-#: callgraphview.cpp:2449 callgraphview.cpp:2472
-msgid "max. 5"
-msgstr "max. 5"
-
-#: callgraphview.cpp:2450 callgraphview.cpp:2473
-msgid "max. 10"
-msgstr "max. 10"
-
-#: callgraphview.cpp:2451 callgraphview.cpp:2474
-msgid "max. 15"
-msgstr "max. 15"
-
-#: callgraphview.cpp:2461 callgraphview.cpp:2484
-#, c-format
-msgid "< %1"
-msgstr "< %1"
-
-#: callgraphview.cpp:2490
-msgid "No Minimum"
-msgstr "No Minimum"
-
-#: callgraphview.cpp:2494
-#, c-format
-msgid "50 %"
-msgstr "50 %"
-
-#: callgraphview.cpp:2495
-#, c-format
-msgid "20 %"
-msgstr "20 %"
-
-#: callgraphview.cpp:2496
-#, c-format
-msgid "10 %"
-msgstr "10 %"
-
-#: callgraphview.cpp:2497
-#, c-format
-msgid "5 %"
-msgstr "5 %"
+"<b>Cost Types List</b>"
+"<p>This list shows all cost types available and what the self/inclusive cost of "
+"the current selected function is for that cost type.</p>"
+"<p>By choosing a cost type from the list, you change the cost type of costs "
+"shown all over KCachegrind to be the selected one.</p>"
 
-#: callgraphview.cpp:2498
-#, c-format
-msgid "3 %"
-msgstr "3 %"
+#: costtypeview.cpp:98
+msgid "Set Secondary Event Type"
+msgstr "Set Secondary Event Type"
 
-#: callgraphview.cpp:2499
-#, c-format
-msgid "2 %"
-msgstr "2 %"
+#: costtypeview.cpp:100
+msgid "Remove Secondary Event Type"
+msgstr "Remove Secondary Event Type"
 
-#: callgraphview.cpp:2500
-#, c-format
-msgid "1.5 %"
-msgstr "1.5 %"
+#: costtypeview.cpp:105
+msgid "Edit Long Name"
+msgstr "Edit Long Name"
 
-#: callgraphview.cpp:2501
-#, c-format
-msgid "1 %"
-msgstr "1 %"
+#: costtypeview.cpp:106
+msgid "Edit Short Name"
+msgstr "Edit Short Name"
 
-#: callgraphview.cpp:2517
-msgid "Same as Node"
-msgstr "Same as Node"
+#: costtypeview.cpp:107
+msgid "Edit Formula"
+msgstr "Edit Formula"
 
-#: callgraphview.cpp:2518
-#, c-format
-msgid "50 % of Node"
-msgstr "50 % of Node"
+#: costtypeview.cpp:115
+msgid "New Cost Type ..."
+msgstr "New Cost Type ..."
 
-#: callgraphview.cpp:2519
+#: costtypeview.cpp:149 costtypeview.cpp:154
 #, c-format
-msgid "20 % of Node"
-msgstr "20 % of Node"
+msgid "New%1"
+msgstr "New%1"
 
-#: callgraphview.cpp:2520
+#: costtypeview.cpp:155
 #, c-format
-msgid "10 % of Node"
-msgstr "10 % of Node"
-
-#: callgraphview.cpp:2530
-msgid "Caller Depth"
-msgstr "Caller Depth"
-
-#: callgraphview.cpp:2531
-msgid "Callee Depth"
-msgstr "Callee Depth"
-
-#: callgraphview.cpp:2532
-msgid "Min. Node Cost"
-msgstr "Min. Node Cost"
-
-#: callgraphview.cpp:2533
-msgid "Min. Call Cost"
-msgstr "Min. Call Cost"
-
-#: callgraphview.cpp:2535
-msgid "Arrows for Skipped Calls"
-msgstr "Arrows for Skipped Calls"
-
-#: callgraphview.cpp:2537
-msgid "Inner-cycle Calls"
-msgstr "Inner-cycle Calls"
-
-#: callgraphview.cpp:2539
-msgid "Cluster Groups"
-msgstr "Cluster Groups"
-
-#: callgraphview.cpp:2544
-msgid "Compact"
-msgstr "Compact"
-
-#: callgraphview.cpp:2545
-msgid "Normal"
-msgstr "Normal"
-
-#: callgraphview.cpp:2546
-msgid "Tall"
-msgstr "Tall"
-
-#: callgraphview.cpp:2551
-msgid "Top to Down"
-msgstr "Top to Down"
-
-#: callgraphview.cpp:2552
-msgid "Left to Right"
-msgstr "Left to Right"
-
-#: callgraphview.cpp:2553
-msgid "Circular"
-msgstr "Circular"
-
-#: callgraphview.cpp:2559
-msgid "TopLeft"
-msgstr "TopLeft"
-
-#: callgraphview.cpp:2560
-msgid "TopRight"
-msgstr "TopRight"
-
-#: callgraphview.cpp:2561
-msgid "BottomLeft"
-msgstr "BottomLeft"
+msgid "New Cost Type %1"
+msgstr "New Cost Type %1"
 
-#: callgraphview.cpp:2562
-msgid "BottomRight"
-msgstr "BottomRight"
+#: costtypeitem.cpp:56
+msgid "Unknown Type"
+msgstr "Unknown Type"
 
-#. i18n: file configdlgbase.ui line 246
-#: callgraphview.cpp:2563 rc.cpp:42 rc.cpp:51 rc.cpp:54
+#. i18n: file dumpselectionbase.ui line 906
+#: instrview.cpp:125 rc.cpp:264 sourceview.cpp:50
 #, no-c-format
-msgid "Automatic"
-msgstr "Automatic"
-
-#: callgraphview.cpp:2570
-msgid "Graph"
-msgstr "Graph"
-
-#: callgraphview.cpp:2572
-msgid "Birds-eye View"
-msgstr "Birds-eye View"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Jonathan Riddell"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kde-en-gb@jriddell.org"
-
-#: coverageitem.cpp:65 coverageitem.cpp:205 functionitem.cpp:72
-#, c-format
-msgid ""
-"_n: (%n function skipped)\n"
-"(%n functions skipped)"
-msgstr ""
-"(%n function skipped)\n"
-"(%n functions skipped)"
-
-#: main.cpp:38
-msgid "Run <exec> under cachegrind"
-msgstr "Run <exec> under cachegrind"
-
-#: main.cpp:39
-msgid "Show information of this trace"
-msgstr "Show information of this trace"
-
-#: main.cpp:46
-msgid "KCachegrind"
-msgstr "KCachegrind"
-
-#: main.cpp:48
-msgid "TDE Frontend for Cachegrind"
-msgstr "TDE Frontend for Cachegrind"
-
-#: main.cpp:50
-msgid "(C) 2002, 2003, 2004"
-msgstr "(C) 2002, 2003, 2004"
-
-#: main.cpp:53
-msgid "Author/Maintainer"
-msgstr "Author/Maintainer"
-
-#: tabview.cpp:64
-msgid "Move to Top"
-msgstr "Move to Top"
-
-#: tabview.cpp:68
-msgid "Move to Right"
-msgstr "Move to Right"
-
-#: tabview.cpp:72
-msgid "Move to Bottom"
-msgstr "Move to Bottom"
-
-#: tabview.cpp:76
-msgid "Move to Bottom Left"
-msgstr "Move to Bottom Left"
-
-#: tabview.cpp:77 tabview.cpp:94 treemap.cpp:2908
-msgid "Bottom Left"
-msgstr "Bottom Left"
-
-#: tabview.cpp:79
-msgid "Move Area To"
-msgstr "Move Area To"
-
-#: tabview.cpp:81
-msgid "Hide This Tab"
-msgstr "Hide This Tab"
-
-#: tabview.cpp:82
-msgid "Hide Area"
-msgstr "Hide Area"
-
-#: tabview.cpp:95
-msgid "Show Hidden On"
-msgstr "Show Hidden On"
-
-#: tabview.cpp:242
-msgid "(No profile data file loaded)"
-msgstr "(No profile data file loaded)"
-
-#: tabview.cpp:281
-msgid "Types"
-msgstr "Types"
-
-#: tabview.cpp:284
-msgid "Callers"
-msgstr "Callers"
-
-#: tabview.cpp:287
-msgid "All Callers"
-msgstr "All Callers"
-
-#: tabview.cpp:290
-msgid "Caller Map"
-msgstr "Caller Map"
-
-#: tabview.cpp:293
-msgid "Source"
-msgstr "Source"
-
-#: tabview.cpp:297
-msgid "Parts"
-msgstr "Parts"
-
-#: tabview.cpp:300
-msgid "Call Graph"
-msgstr "Call Graph"
-
-#: tabview.cpp:303
-msgid "Callees"
-msgstr "Callees"
-
-#: tabview.cpp:306
-msgid "All Callees"
-msgstr "All Callees"
-
-#: tabview.cpp:310
-msgid "Callee Map"
-msgstr "Callee Map"
-
-#: tabview.cpp:553
-msgid ""
-"<b>Information Tabs</b>"
-"<p>This widget shows information for the current selected function in different "
-"tabs: "
-"<ul>"
-"<li>The Costs tab shows a list of available event types and the inclusive and "
-"self costs regarding to these types.</li>"
-"<li>The Parts tab shows a list of trace parts if the trace consists of more "
-"than one part (otherwise, this tab is hided). The cost of the selected function "
-"spent in the different parts together with the calls happening is shown.</li>"
-"<li>The Call Lists tab shows direct callers and callees of the function in more "
-"detail.</li>"
-"<li>The Coverage tab shows the same is the Call Lists tab, but not only direct "
-"callers and callees but also indirect ones.</li>"
-"<li>The Call Graph tab shows a graphical visualization of the calls done by "
-"this function.</li>"
-"<li>The Source tab presents annotated source code if debugging information and "
-"the source file is available.</li>"
-"<li>The Assembler tab presents annotated assembler code if trace information on "
-"instruction level is available.</li></ul>For more information, see the <em>"
-"What's This?</em> help of the corresponding tab widget</p>"
-msgstr ""
-"<b>Information Tabs</b>"
-"<p>This widget shows information for the currently selected function in "
-"different tabs: "
-"<ul>"
-"<li>The Costs tab shows a list of available event types and the inclusive and "
-"self costs associated with these types.</li>"
-"<li>The Parts tab shows a list of trace parts if the trace consists of more "
-"than one part (otherwise this tab is hidden). The cost of the selected function "
-"spent in the different parts, together with the calls that are taking place, is "
-"shown.</li>"
-"<li>The Call Lists tab shows direct callers and callees of the function in more "
-"detail.</li>"
-"<li>The Coverage tab shows the same as the Call Lists tab, but shows indirect "
-"as well as direct callers and callees.</li>"
-"<li>The Call Graph tab shows a graphical visualisation of the calls made by "
-"this function.</li>"
-"<li>The Source tab presents annotated source code if debugging information and "
-"the source file is available.</li>"
-"<li>The Assembler tab presents annotated assembler code if trace information at "
-"instruction level is available.</li></ul>For more information, see the <em>"
-"What's This?</em> help of the corresponding tab widget</p>"
-
-#: tabview.cpp:630
-msgid "(No Data loaded)"
-msgstr "(No Data loaded)"
-
-#: tabview.cpp:631
-msgid "(No function selected)"
-msgstr "(No function selected)"
+msgid "#"
+msgstr "No."
 
 #: sourceview.cpp:54 sourceview.cpp:554
 msgid "Source (unknown)"
@@ -1620,18 +1773,6 @@ msgstr "Add the folder of this file to the source folder list."
 msgid "The list can be found in the configuration dialog."
 msgstr "The list can be found in the configuration dialogue."
 
-#: partlistitem.cpp:49
-msgid " (Thread %1)"
-msgstr " (Thread %1)"
-
-#: partlistitem.cpp:56
-msgid "(none)"
-msgstr "(none)"
-
-#: callitem.cpp:82 partlistitem.cpp:152
-msgid "(active)"
-msgstr "(active)"
-
 #: functionselection.cpp:176
 #, c-format
 msgid "Go to %1"
@@ -1645,164 +1786,6 @@ msgstr "Show All Items"
 msgid "No Grouping"
 msgstr "No Grouping"
 
-#: coverageview.cpp:48 coverageview.cpp:54
-msgid "Distance"
-msgstr "Distance"
-
-#. i18n: file dumpselectionbase.ui line 928
-#: coverageview.cpp:49 partview.cpp:49 rc.cpp:270 rc.cpp:315
-#, no-c-format
-msgid "Called"
-msgstr "Called"
-
-#: callview.cpp:48 coverageview.cpp:50
-msgid "Caller"
-msgstr "Caller"
-
-#: coverageview.cpp:55
-msgid "Calling"
-msgstr "Calling"
-
-#: callview.cpp:52 coverageview.cpp:56
-msgid "Callee"
-msgstr "Callee"
-
-#: coverageview.cpp:90
-msgid ""
-"<b>List of all Callers</b>"
-"<p>This list shows all functions calling the current selected one, either "
-"directly or with several functions in-between on the stack; the number of "
-"functions in-between plus one is called the <em>Distance</em> "
-"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
-"calls C, i.e. A => B => C. The distance here is 2).</p>"
-"<p>Absolute cost shown is the cost spent in the selected function while a "
-"listed function is active; relative cost is the percentage of all cost spent in "
-"the selected function while the listed one is active. The cost graphic shows "
-"logarithmic percentage with a different color for each distance.</p>"
-"<p>As there can be many calls from the same function, the distance column "
-"sometimes shows the range of distances for all calls happening; then, in "
-"parentheses, there is the medium distance, i.e. the distance where most of the "
-"call costs happened.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
-msgstr ""
-"<b>List of all Callers</b>"
-"<p>This list shows all functions calling the current selected one, either "
-"directly or with several functions in-between on the stack; the number of "
-"functions in-between plus one is called the <em>Distance</em> "
-"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
-"calls C, i.e. A => B => C. The distance here is 2).</p>"
-"<p>Absolute cost shown is the cost spent in the selected function while a "
-"listed function is active; relative cost is the percentage of all cost spent in "
-"the selected function while the listed one is active. The cost graphic shows "
-"logarithmic percentage with a different colour for each distance.</p>"
-"<p>As there can be many calls from the same function, the distance column "
-"sometimes shows the range of distances for all calls happening; then, in "
-"brackets, there is the medium distance, i.e. the distance where most of the "
-"call costs happened.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
-
-#: coverageview.cpp:120
-msgid ""
-"<b>List of all Callees</b>"
-"<p>This list shows all functions called by the current selected one, either "
-"directly or with several function in-between on the stack; the number of "
-"function in-between plus one is called the <em>Distance</em> "
-"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
-"calls C, i.e. A => B => C. The distance here is 2).</p>"
-"<p>Absolute cost shown is the cost spent in the listed function while the "
-"selected is active; relative cost is the percentage of all cost spent in the "
-"listed function while the selected one is active. The cost graphic always shows "
-"logarithmic percentage with a different color for each distance.</p>"
-"<p>As there can be many calls to the same function, the distance column "
-"sometimes shows the range of distances for all calls happening; then, in "
-"parentheses, there is the medium distance, i.e. the distance where most of the "
-"call costs happened.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
-msgstr ""
-"<b>List of all Callees</b>"
-"<p>This list shows all functions called by the current selected one, either "
-"directly or with several function in-between on the stack; the number of "
-"function in-between plus one is called the <em>Distance</em> "
-"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
-"calls C, i.e. A => B => C. The distance here is 2).</p>"
-"<p>Absolute cost shown is the cost spent in the listed function while the "
-"selected is active; relative cost is the percentage of all cost spent in the "
-"listed function while the selected one is active. The cost graphic always shows "
-"logarithmic percentage with a different colour for each distance.</p>"
-"<p>As there can be many calls to the same function, the distance column "
-"sometimes shows the range of distances for all calls happening; then, in "
-"brackets, there is the medium distance, i.e. the distance where most of the "
-"call costs happened.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
-
-#: configuration.cpp:63
-msgid "Instruction Fetch"
-msgstr "Instruction Fetch"
-
-#: configuration.cpp:64
-msgid "Data Read Access"
-msgstr "Data Read Access"
-
-#: configuration.cpp:65
-msgid "Data Write Access"
-msgstr "Data Write Access"
-
-#: configuration.cpp:66
-msgid "L1 Instr. Fetch Miss"
-msgstr "L1 Instr. Fetch Miss"
-
-#: configuration.cpp:67
-msgid "L1 Data Read Miss"
-msgstr "L1 Data Read Miss"
-
-#: configuration.cpp:68
-msgid "L1 Data Write Miss"
-msgstr "L1 Data Write Miss"
-
-#: configuration.cpp:69
-msgid "L2 Instr. Fetch Miss"
-msgstr "L2 Instr. Fetch Miss"
-
-#: configuration.cpp:70
-msgid "L2 Data Read Miss"
-msgstr "L2 Data Read Miss"
-
-#: configuration.cpp:71
-msgid "L2 Data Write Miss"
-msgstr "L2 Data Write Miss"
-
-#: configuration.cpp:72
-msgid "Samples"
-msgstr "Samples"
-
-#: configuration.cpp:73
-msgid "System Time"
-msgstr "System Time"
-
-#: configuration.cpp:74
-msgid "User Time"
-msgstr "User Time"
-
-#: configuration.cpp:75
-msgid "L1 Miss Sum"
-msgstr "L1 Miss Sum"
-
-#: configuration.cpp:76
-msgid "L2 Miss Sum"
-msgstr "L2 Miss Sum"
-
-#: configuration.cpp:77
-msgid "Cycle Estimation"
-msgstr "Cycle Estimation"
-
 #. i18n: file tdecachegrindui.rc line 15
 #: rc.cpp:9
 #, no-c-format
@@ -1857,6 +1840,12 @@ msgstr "Maximum number of items in lists:"
 msgid "Cost Item Colors"
 msgstr "Cost Item Colours"
 
+#. i18n: file configdlgbase.ui line 246
+#: callgraphview.cpp:2562 rc.cpp:42 rc.cpp:51 rc.cpp:54
+#, no-c-format
+msgid "Automatic"
+msgstr "Automatic"
+
 #. i18n: file configdlgbase.ui line 254
 #: rc.cpp:45
 #, no-c-format
@@ -2169,12 +2158,6 @@ msgstr "Executed"
 msgid "Basic Blocks"
 msgstr "Basic Blocks"
 
-#. i18n: file dumpselectionbase.ui line 754
-#: callmapview.cpp:63 rc.cpp:234 rc.cpp:339
-#, no-c-format
-msgid "Calls"
-msgstr "Calls"
-
 #. i18n: file dumpselectionbase.ui line 796
 #: rc.cpp:243
 #, no-c-format
@@ -2187,12 +2170,6 @@ msgstr "Ir"
 msgid "Distinct"
 msgstr "Distinct"
 
-#. i18n: file dumpselectionbase.ui line 824
-#: configdlg.cpp:58 rc.cpp:249
-#, no-c-format
-msgid "ELF Objects"
-msgstr "ELF Objects"
-
 #. i18n: file dumpselectionbase.ui line 838
 #: rc.cpp:252
 #, no-c-format
@@ -2217,12 +2194,6 @@ msgstr "Stack trace:"
 msgid "Sync."
 msgstr "Sync."
 
-#. i18n: file dumpselectionbase.ui line 950
-#: callmapview.cpp:61 rc.cpp:276 rc.cpp:321
-#, no-c-format
-msgid "Location"
-msgstr "Location"
-
 #. i18n: file dumpselectionbase.ui line 976
 #: rc.cpp:279
 #, no-c-format
@@ -2283,6 +2254,452 @@ msgstr "Stack Selection"
 msgid "Cost2"
 msgstr "Cost2"
 
+#: partgraph.cpp:167
+#, c-format
+msgid "Profile Part %1"
+msgstr "Profile Part %1"
+
+#: partgraph.cpp:226
+msgid "(no trace)"
+msgstr "(no trace)"
+
+#: partgraph.cpp:229
+msgid "(no part)"
+msgstr "(no part)"
+
+#: configuration.cpp:67
+msgid "Instruction Fetch"
+msgstr "Instruction Fetch"
+
+#: configuration.cpp:68
+msgid "Data Read Access"
+msgstr "Data Read Access"
+
+#: configuration.cpp:69
+msgid "Data Write Access"
+msgstr "Data Write Access"
+
+#: configuration.cpp:70
+msgid "L1 Instr. Fetch Miss"
+msgstr "L1 Instr. Fetch Miss"
+
+#: configuration.cpp:71
+msgid "L1 Data Read Miss"
+msgstr "L1 Data Read Miss"
+
+#: configuration.cpp:72
+msgid "L1 Data Write Miss"
+msgstr "L1 Data Write Miss"
+
+#: configuration.cpp:73
+msgid "L2 Instr. Fetch Miss"
+msgstr "L2 Instr. Fetch Miss"
+
+#: configuration.cpp:74
+msgid "L2 Data Read Miss"
+msgstr "L2 Data Read Miss"
+
+#: configuration.cpp:75
+msgid "L2 Data Write Miss"
+msgstr "L2 Data Write Miss"
+
+#: configuration.cpp:76
+#, fuzzy
+msgid "LL Instr. Fetch Miss"
+msgstr "L1 Instr. Fetch Miss"
+
+#: configuration.cpp:77
+#, fuzzy
+msgid "LL Data Read Miss"
+msgstr "L1 Data Read Miss"
+
+#: configuration.cpp:78
+#, fuzzy
+msgid "LL Data Write Miss"
+msgstr "L1 Data Write Miss"
+
+#: configuration.cpp:79
+msgid "Samples"
+msgstr "Samples"
+
+#: configuration.cpp:80
+msgid "System Time"
+msgstr "System Time"
+
+#: configuration.cpp:81
+msgid "User Time"
+msgstr "User Time"
+
+#: configuration.cpp:82
+msgid "L1 Miss Sum"
+msgstr "L1 Miss Sum"
+
+#: configuration.cpp:83
+msgid "L2 Miss Sum"
+msgstr "L2 Miss Sum"
+
+#: configuration.cpp:84
+#, fuzzy
+msgid "LL Miss Sum"
+msgstr "L1 Miss Sum"
+
+#: configuration.cpp:85
+msgid "Cycle Estimation"
+msgstr "Cycle Estimation"
+
+#: partview.cpp:51
+msgid "Comment"
+msgstr "Comment"
+
+#: partview.cpp:73
+msgid ""
+"<b>Trace Part List</b>"
+"<p>This list shows all trace parts of the loaded trace. For each part, the "
+"self/inclusive cost of the current selected function, spent in the part, is "
+"shown; percentage costs are always relative to the total cost <em>"
+"of the part</em> (not to the whole trace as in the Trace Part Overview). Also "
+"shown are the calls happening to/from the current function inside of the trace "
+"part.</p>"
+"<p>By choosing one or more trace parts from the list, the costs shown all over "
+"KCachegrind will only be the ones spent in the selected part(s). If no list "
+"selection is shown, in fact all trace parts are selected implicitly.</p>"
+"<p>This is a multi-selection list. You can select ranges by dragging the mouse "
+"or use SHIFT/CTRL modifiers. Selection/Deselection of trace parts can also be "
+"done by using the Trace Part Overview Dockable. This one also supports multiple "
+"selection.</p>"
+"<p>Note that the list is hidden if only one trace part is loaded.</p>"
+msgstr ""
+"<b>Trace Part List</b>"
+"<p>This list shows all trace parts of the loaded trace. For each part, the "
+"self/inclusive cost of the current selected function, spent in the part, is "
+"shown; percentage costs are always relative to the total cost <em>"
+"of the part</em> (not to the whole trace as in the Trace Part Overview). Also "
+"shown are the calls happening to/from the current function inside of the trace "
+"part.</p>"
+"<p>By choosing one or more trace parts from the list, the costs shown all over "
+"KCachegrind will only be the ones spent in the selected part(s). If no list "
+"selection is shown, in fact all trace parts are selected implicitly.</p>"
+"<p>This is a multi-selection list. You can select ranges by dragging the mouse "
+"or use SHIFT/CTRL modifiers. Selection/Deselection of trace parts can also be "
+"done by using the Trace Part Overview Dockable. This one also supports multiple "
+"selection.</p>"
+"<p>Note that the list is hidden if only one trace part is loaded.</p>"
+
+#: partview.cpp:106
+msgid "Select '%1'"
+msgstr "Select '%1'"
+
+#: partview.cpp:107
+msgid "Hide '%1'"
+msgstr "Hide '%1'"
+
+#: partview.cpp:111
+msgid "Hide Selected"
+msgstr "Hide Selected"
+
+#: partview.cpp:112
+msgid "Show All"
+msgstr "Show All"
+
+#: traceitemview.cpp:53
+msgid "No description available"
+msgstr "No description available"
+
+#: coverageitem.cpp:65 coverageitem.cpp:205 functionitem.cpp:72
+#, c-format
+msgid ""
+"_n: (%n function skipped)\n"
+"(%n functions skipped)"
+msgstr ""
+"(%n function skipped)\n"
+"(%n functions skipped)"
+
+#: callgraphview.cpp:306
+#, c-format
+msgid "Call(s) from %1"
+msgstr "Call(s) from %1"
+
+#: callgraphview.cpp:307
+#, c-format
+msgid "Call(s) to %1"
+msgstr "Call(s) to %1"
+
+#: callgraphview.cpp:308
+msgid "(unknown call)"
+msgstr "(unknown call)"
+
+#: callgraphview.cpp:1425
+msgid ""
+"<b>Call Graph around active Function</b>"
+"<p>Depending on configuration, this view shows the call graph environment of "
+"the active function. Note: the shown cost is <b>only</b> "
+"the cost which is spent while the active function was actually running; i.e. "
+"the cost shown for main() - if it's visible - should be the same as the cost of "
+"the active function, as that's the part of inclusive cost of main() spent while "
+"the active function was running.</p>"
+"<p>For cycles, blue call arrows indicate that this is an artificial call added "
+"for correct drawing which actually never happened.</p>"
+"<p>If the graph is larger than the widget area, an overview panner is shown in "
+"one edge. There are similar visualization options to the Call Treemap; the "
+"selected function is highlighted."
+"<p>"
+msgstr ""
+"<b>Call Graph around active Function</b>"
+"<p>Depending on configuration, this view shows the call graph environment of "
+"the active function. Note: the shown cost is <b>only</b> "
+"the cost which is spent while the active function was actually running; i.e. "
+"the cost shown for main() - if it's visible - should be the same as the cost of "
+"the active function, as that's the part of inclusive cost of main() spent while "
+"the active function was running.</p>"
+"<p>For cycles, blue call arrows indicate that this is an artificial call added "
+"for correct drawing which actually never happened.</p>"
+"<p>If the graph is larger than the widget area, an overview panner is shown in "
+"one edge. There are similar visualising options to the Call Treemap; the "
+"selected function is highlighted."
+"<p>"
+
+#: callgraphview.cpp:1789
+msgid ""
+"Warning: a long lasting graph layouting is in progress.\n"
+"Reduce node/edge limits for speedup.\n"
+msgstr ""
+"Warning: a long lasting graph layouting is in progress.\n"
+"Reduce node/edge limits for speedup.\n"
+
+#: callgraphview.cpp:1792
+msgid ""
+"Layouting stopped.\n"
+msgstr ""
+"Layouting stopped.\n"
+
+#: callgraphview.cpp:1794
+msgid ""
+"The call graph has %1 nodes and %2 edges.\n"
+msgstr ""
+"The call graph has %1 nodes and %2 edges.\n"
+
+#: callgraphview.cpp:1827
+msgid "No item activated for which to draw the call graph."
+msgstr "No item activated for which to draw the call graph."
+
+#: callgraphview.cpp:1838
+msgid "No call graph can be drawn for the active item."
+msgstr "No call graph can be drawn for the active item."
+
+#: callgraphview.cpp:1867
+msgid ""
+"No call graph is available because the following\n"
+"command cannot be run:\n"
+"'%1'\n"
+msgstr ""
+"No call graph is available because the following\n"
+"command cannot be run:\n"
+"'%1'\n"
+
+#: callgraphview.cpp:1870 callgraphview.cpp:2199
+msgid "Please check that 'dot' is installed (package GraphViz)."
+msgstr "Please check that 'dot' is installed (package GraphViz)."
+
+#: callgraphview.cpp:2198
+msgid ""
+"Error running the graph layouting tool.\n"
+msgstr ""
+"Error running the graph layouting tool.\n"
+
+#: callgraphview.cpp:2206
+msgid ""
+"There is no call graph available for function\n"
+"\t'%1'\n"
+"because it has no cost of the selected event type."
+msgstr ""
+"There is no call graph available for function\n"
+"\t'%1'\n"
+"because it has no cost of the selected event type."
+
+#: callgraphview.cpp:2427
+msgid "Stop Layouting"
+msgstr "Stop Layouting"
+
+#: callgraphview.cpp:2435
+msgid "As PostScript"
+msgstr "As PostScript"
+
+#: callgraphview.cpp:2436
+msgid "As Image ..."
+msgstr "As Image ..."
+
+#: callgraphview.cpp:2438
+msgid "Export Graph"
+msgstr "Export Graph"
+
+#: callgraphview.cpp:2443 callgraphview.cpp:2466
+msgid "Unlimited"
+msgstr "Unlimited"
+
+#: callgraphview.cpp:2446 callgraphview.cpp:2469
+msgid "None"
+msgstr "None"
+
+#: callgraphview.cpp:2447 callgraphview.cpp:2470
+msgid "max. 2"
+msgstr "max. 2"
+
+#: callgraphview.cpp:2448 callgraphview.cpp:2471
+msgid "max. 5"
+msgstr "max. 5"
+
+#: callgraphview.cpp:2449 callgraphview.cpp:2472
+msgid "max. 10"
+msgstr "max. 10"
+
+#: callgraphview.cpp:2450 callgraphview.cpp:2473
+msgid "max. 15"
+msgstr "max. 15"
+
+#: callgraphview.cpp:2460 callgraphview.cpp:2483
+#, c-format
+msgid "< %1"
+msgstr "< %1"
+
+#: callgraphview.cpp:2489
+msgid "No Minimum"
+msgstr "No Minimum"
+
+#: callgraphview.cpp:2493
+#, c-format
+msgid "50 %"
+msgstr "50 %"
+
+#: callgraphview.cpp:2494
+#, c-format
+msgid "20 %"
+msgstr "20 %"
+
+#: callgraphview.cpp:2495
+#, c-format
+msgid "10 %"
+msgstr "10 %"
+
+#: callgraphview.cpp:2496
+#, c-format
+msgid "5 %"
+msgstr "5 %"
+
+#: callgraphview.cpp:2497
+#, c-format
+msgid "3 %"
+msgstr "3 %"
+
+#: callgraphview.cpp:2498
+#, c-format
+msgid "2 %"
+msgstr "2 %"
+
+#: callgraphview.cpp:2499
+#, c-format
+msgid "1.5 %"
+msgstr "1.5 %"
+
+#: callgraphview.cpp:2500
+#, c-format
+msgid "1 %"
+msgstr "1 %"
+
+#: callgraphview.cpp:2516
+msgid "Same as Node"
+msgstr "Same as Node"
+
+#: callgraphview.cpp:2517
+#, c-format
+msgid "50 % of Node"
+msgstr "50 % of Node"
+
+#: callgraphview.cpp:2518
+#, c-format
+msgid "20 % of Node"
+msgstr "20 % of Node"
+
+#: callgraphview.cpp:2519
+#, c-format
+msgid "10 % of Node"
+msgstr "10 % of Node"
+
+#: callgraphview.cpp:2529
+msgid "Caller Depth"
+msgstr "Caller Depth"
+
+#: callgraphview.cpp:2530
+msgid "Callee Depth"
+msgstr "Callee Depth"
+
+#: callgraphview.cpp:2531
+msgid "Min. Node Cost"
+msgstr "Min. Node Cost"
+
+#: callgraphview.cpp:2532
+msgid "Min. Call Cost"
+msgstr "Min. Call Cost"
+
+#: callgraphview.cpp:2534
+msgid "Arrows for Skipped Calls"
+msgstr "Arrows for Skipped Calls"
+
+#: callgraphview.cpp:2536
+msgid "Inner-cycle Calls"
+msgstr "Inner-cycle Calls"
+
+#: callgraphview.cpp:2538
+msgid "Cluster Groups"
+msgstr "Cluster Groups"
+
+#: callgraphview.cpp:2543
+msgid "Compact"
+msgstr "Compact"
+
+#: callgraphview.cpp:2544
+msgid "Normal"
+msgstr "Normal"
+
+#: callgraphview.cpp:2545
+msgid "Tall"
+msgstr "Tall"
+
+#: callgraphview.cpp:2550
+msgid "Top to Down"
+msgstr "Top to Down"
+
+#: callgraphview.cpp:2551
+msgid "Left to Right"
+msgstr "Left to Right"
+
+#: callgraphview.cpp:2552
+msgid "Circular"
+msgstr "Circular"
+
+#: callgraphview.cpp:2558
+msgid "TopLeft"
+msgstr "TopLeft"
+
+#: callgraphview.cpp:2559
+msgid "TopRight"
+msgstr "TopRight"
+
+#: callgraphview.cpp:2560
+msgid "BottomLeft"
+msgstr "BottomLeft"
+
+#: callgraphview.cpp:2561
+msgid "BottomRight"
+msgstr "BottomRight"
+
+#: callgraphview.cpp:2569
+msgid "Graph"
+msgstr "Graph"
+
+#: callgraphview.cpp:2571
+msgid "Birds-eye View"
+msgstr "Birds-eye View"
+
 #: treemap.cpp:1281
 #, c-format
 msgid "Text %1"
@@ -2329,10 +2746,6 @@ msgstr "Correct Borders Only"
 msgid "Width %1"
 msgstr "Width %1"
 
-#: callmapview.cpp:321 treemap.cpp:2889
-msgid "Shading"
-msgstr "Shading"
-
 #: treemap.cpp:2902
 msgid "Visible"
 msgstr "Visible"
@@ -2365,14 +2778,6 @@ msgstr "Bottom Right"
 msgid "No %1 Limit"
 msgstr "No %1 Limit"
 
-#: callmapview.cpp:243 treemap.cpp:3039
-msgid "No Area Limit"
-msgstr "No Area Limit"
-
-#: callmapview.cpp:258 treemap.cpp:3045
-msgid "Area of '%1' (%2)"
-msgstr "Area of '%1' (%2)"
-
 #: treemap.cpp:3056 treemap.cpp:3067
 #, c-format
 msgid ""
@@ -2382,22 +2787,10 @@ msgstr ""
 "1 Pixel\n"
 "%n Pixels"
 
-#: callmapview.cpp:264 treemap.cpp:3071
-msgid "Double Area Limit (to %1)"
-msgstr "Double Area Limit (to %1)"
-
 #: treemap.cpp:3073
 msgid "Halve Area Limit (to %1)"
 msgstr "Halve Area Limit (to %1)"
 
-#: callmapview.cpp:187 treemap.cpp:3101
-msgid "No Depth Limit"
-msgstr "No Depth Limit"
-
-#: callmapview.cpp:198 treemap.cpp:3107
-msgid "Depth of '%1' (%2)"
-msgstr "Depth of '%1' (%2)"
-
 #: treemap.cpp:3118
 #, c-format
 msgid "Depth %1"
@@ -2411,521 +2804,151 @@ msgstr "Decrement (to %1)"
 msgid "Increment (to %1)"
 msgstr "Increment (to %1)"
 
-#: callmapview.cpp:98
-msgid ""
-"<b>Caller Map</b>"
-"<p>This graph shows the nested hierarchy of all callers of the current "
-"activated function. Each colored rectangle represents a function; its size "
-"tries to be proportional to the cost spent therein while the active function is "
-"running (however, there are drawing constrains).</p>"
-msgstr ""
-"<b>Caller Map</b>"
-"<p>This graph shows the nested hierarchy of all callers of the current "
-"activated function. Each coloured rectangle represents a function; its size "
-"tries to be proportional to the cost spent therein while the active function is "
-"running (however, there are drawing constrains).</p>"
-
-#: callmapview.cpp:105
-msgid ""
-"<b>Call Map</b>"
-"<p>This graph shows the nested hierarchy of all callees of the current "
-"activated function. Each colored rectangle represents a function; its size "
-"tries to be proportional to the cost spent therein while the active function is "
-"running (however, there are drawing constrains).</p>"
-msgstr ""
-"<b>Call Map</b>"
-"<p>This graph shows the nested hierarchy of all callees of the current "
-"activated function. Each coloured rectangle represents a function; its size "
-"tries to be proportional to the cost spent therein while the active function is "
-"running (however, there are drawing constrains).</p>"
-
-#: callmapview.cpp:113
-msgid ""
-"<p>Appearance options can be found in the in the context menu. To get exact "
-"size proportions, choose 'Hide incorrect borders'. As this mode can be <em>"
-"very</em> time consuming, you may want to limit the maximum drawn nesting level "
-"before. 'Best' determinates the split direction for children from the aspect "
-"ratio of the parent. 'Always Best' decides on remaining space for each sibling. "
-"'Ignore Proportions' takes space for function name drawing <em>before</em> "
-"drawing children. Note that size proportions can get <em>heavily</em> wrong.</p>"
-"<p>This is a <em>TreeMap</em> widget. Keyboard navigation is available with the "
-"left/right arrow keys for traversing siblings, and up/down arrow keys to go a "
-"nesting level up/down. <em>Return</em> activates the current item.</p>"
-msgstr ""
-"<p>Appearance options can be found in the in the context menu. To get exact "
-"size proportions, choose 'Hide incorrect borders'. As this mode can be <em>"
-"very</em> time consuming, you may want to limit the maximum drawn nesting level "
-"before. 'Best' determinates the split direction for children from the aspect "
-"ratio of the parent. 'Always Best' decides on remaining space for each sibling. "
-"'Ignore Proportions' takes space for function name drawing <em>before</em> "
-"drawing children. Note that size proportions can get <em>heavily</em> wrong.</p>"
-"<p>This is a <em>TreeMap</em> widget. Keyboard navigation is available with the "
-"left/right arrow keys for traversing siblings, and up/down arrow keys to go a "
-"nesting level up/down. <em>Return</em> activates the current item.</p>"
-
-#: callmapview.cpp:167
-msgid "Go To"
-msgstr "Go To"
-
-#: callmapview.cpp:184
-msgid "Stop at Depth"
-msgstr "Stop at Depth"
-
-#: callmapview.cpp:190
-msgid "Depth 10"
-msgstr "Depth 10"
-
-#: callmapview.cpp:192
-msgid "Depth 15"
-msgstr "Depth 15"
-
-#: callmapview.cpp:194
-msgid "Depth 20"
-msgstr "Depth 20"
-
-#: callmapview.cpp:204
-msgid "Decrement Depth (to %1)"
-msgstr "Decrement Depth (to %1)"
-
-#: callmapview.cpp:205
-msgid "Increment Depth (to %1)"
-msgstr "Increment Depth (to %1)"
-
-#: callmapview.cpp:209
-msgid "Stop at Function"
-msgstr "Stop at Function"
-
-#: callmapview.cpp:210
-msgid "No Function Limit"
-msgstr "No Function Limit"
-
-#: callmapview.cpp:240
-msgid "Stop at Area"
-msgstr "Stop at Area"
-
-#: callmapview.cpp:246
-msgid "50 Pixels"
-msgstr "50 Pixels"
-
-#: callmapview.cpp:248
-msgid "100 Pixels"
-msgstr "100 Pixels"
-
-#: callmapview.cpp:250
-msgid "200 Pixels"
-msgstr "200 Pixels"
-
-#: callmapview.cpp:252
-msgid "500 Pixels"
-msgstr "500 Pixels"
-
-#: callmapview.cpp:266
-msgid "Half Area Limit (to %1)"
-msgstr "Half Area Limit (to %1)"
-
-#: callmapview.cpp:273
-msgid "Visualisation"
-msgstr "Visualisation"
-
-#: callmapview.cpp:277
-msgid "Split Direction"
-msgstr "Split Direction"
-
-#: callmapview.cpp:279
-msgid "Skip Incorrect Borders"
-msgstr "Skip Incorrect Borders"
-
-#: callmapview.cpp:284
-msgid "Border Width"
-msgstr "Border Width"
-
-#: callmapview.cpp:285
-msgid "Border 0"
-msgstr "Border 0"
-
-#: callmapview.cpp:288
-msgid "Border 1"
-msgstr "Border 1"
-
-#: callmapview.cpp:290
-msgid "Border 2"
-msgstr "Border 2"
-
-#: callmapview.cpp:292
-msgid "Border 3"
-msgstr "Border 3"
-
-#: callmapview.cpp:297
-msgid "Draw Symbol Names"
-msgstr "Draw Symbol Names"
-
-#: callmapview.cpp:298
-msgid "Draw Cost"
-msgstr "Draw Cost"
-
-#: callmapview.cpp:299
-msgid "Draw Location"
-msgstr "Draw Location"
-
-#: callmapview.cpp:300
-msgid "Draw Calls"
-msgstr "Draw Calls"
-
-#: callmapview.cpp:431
-msgid "Call Map: Current is '%1'"
-msgstr "Call Map: Current is '%1'"
-
-#: callmapview.cpp:599
-msgid "(no function)"
-msgstr "(no function)"
-
-#: callmapview.cpp:741 callmapview.cpp:858
-msgid "(no call)"
-msgstr "(no call)"
-
-#: cachegrindloader.cpp:141
-msgid "Import filter for Cachegrind/Callgrind generated profile data files"
-msgstr "Import filter for Cachegrind/Callgrind generated profile data files"
-
-#: cachegrindloader.cpp:738
-#, c-format
-msgid "Loading %1"
-msgstr "Loading %1"
-
-#: callview.cpp:47 callview.cpp:51
-msgid "Count"
-msgstr "Count"
-
-#: callview.cpp:85
-msgid ""
-"<b>List of direct Callers</b>"
-"<p>This list shows all functions calling the current selected one directly, "
-"together with a call count and the cost spent in the current selected function "
-"while being called from the function from the list.</p>"
-"<p>An icon instead of an inclusive cost specifies that this is a call inside of "
-"a recursive cycle. An inclusive cost makes no sense here.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
-msgstr ""
-"<b>List of direct Callers</b>"
-"<p>This list shows all functions calling the current selected one directly, "
-"together with a call count and the cost spent in the current selected function "
-"while being called from the function from the list.</p>"
-"<p>An icon instead of an inclusive cost specifies that this is a call inside of "
-"a recursive cycle. An inclusive cost makes no sense here.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
+#: callitem.cpp:82 partlistitem.cpp:152
+msgid "(active)"
+msgstr "(active)"
 
-#: callview.cpp:98
-msgid ""
-"<b>List of direct Callees</b>"
-"<p>This list shows all functions called by the current selected one directly, "
-"together with a call count and the cost spent in this function while being "
-"called from the selected function.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
-msgstr ""
-"<b>List of direct Callees</b>"
-"<p>This list shows all functions called by the current selected one directly, "
-"together with a call count and the cost spent in this function while being "
-"called from the selected function.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
+#: instrview.cpp:129
+msgid "Hex"
+msgstr "Hex"
 
-#: costtypeitem.cpp:56
-msgid "Unknown Type"
-msgstr "Unknown Type"
+#: instrview.cpp:132
+msgid "Source Position"
+msgstr "Source Position"
 
-#: tips.cpp:3
+#: instrview.cpp:163
 msgid ""
-"<p>...that the <em>What's This?</em> help for every GUI widget\n"
-"in KCachegrind contains detailed usage information for this widget?\n"
-"It is highly recommended to read at least these help texts on first\n"
-"use. Request <em>What's This?</em> help by pressing\n"
-"Shift+F1 and clicking on the widget.</p>\n"
+"<b>Annotated Assembler</b>"
+"<p>The annotated assembler list shows the machine code instructions of the "
+"current selected function together with (self) cost spent while executing an "
+"instruction. If this is a call instruction, lines with details on the call "
+"happening are inserted into the source: the cost spent inside of the call, the "
+"number of calls happening, and the call destination.</p>"
+"<p>The disassembler output shown is generated with the 'objdump' utility from "
+"the 'binutils' package.</p>"
+"<p>Select a line with call information to make the destination function of this "
+"call current.</p>"
 msgstr ""
-"<p>...that the <em>What's This?</em> help for every GUI widget\n"
-"in KCachegrind contains detailed usage information for this widget?\n"
-"It is highly recommended to read at least these help texts on first\n"
-"use. Request <em>What's This?</em> help by pressing\n"
-"Shift+F1 and clicking on the widget.</p>\n"
+"<b>Annotated Assembler</b>"
+"<p>The annotated assembler list shows the machine code instructions of the "
+"current selected function together with (self) cost spent while executing an "
+"instruction. If this is a call instruction, lines with details on the call "
+"happening are inserted into the source: the cost spent inside of the call, the "
+"number of calls happening, and the call destination.</p>"
+"<p>The disassembler output shown is generated with the 'objdump' utility from "
+"the 'binutils' package.</p>"
+"<p>Select a line with call information to make the destination function of this "
+"call current.</p>"
 
-#: tips.cpp:12
-msgid ""
-"<p>...that you can get profile information at instruction level\n"
-"with Calltree when you provide the option <em>--dump-instr=yes</em>?\n"
-"Use the Assembler View for the instruction annotations.\n"
-"</p>\n"
-msgstr ""
-"<p>...that you can get profile information at instruction level\n"
-"with Calltree when you provide the option <em>--dump-instr=yes</em>?\n"
-"Use the Assembler View for the instruction annotations.\n"
-"</p>\n"
+#: instrview.cpp:195
+#, c-format
+msgid "Go to Address %1"
+msgstr "Go to Address %1"
 
-#: tips.cpp:20
-msgid ""
-"<p>...that you can use Alt-Left/Right keys of your keyboard to go\n"
-"back/forward in the active object history ?</p>\n"
-msgstr ""
-"<p>...that you can use Alt-Left/Right keys of your keyboard to go\n"
-"backwards/forwards in the active object history ?</p>\n"
+#: instrview.cpp:207
+msgid "Hex Code"
+msgstr "Hex Code"
 
-#: tips.cpp:26
-msgid ""
-"<p>...that you can navigate in the Callee/Caller Map View using\n"
-"arrow keys? Use Left/Right to change to siblings of the current\n"
-"item; use Up/Down to go one nesting level up/down. To select\n"
-"the current item, press Space, and to activate it, press Return.\n"
-"</p>\n"
-msgstr ""
-"<p>...that you can navigate in the Callee/Caller Map View using\n"
-"arrow keys? Use Left/Right to change to siblings of the current\n"
-"item; use Up/Down to go one nesting level up/down. To select\n"
-"the current item, press Space, and to activate it, press Return.\n"
-"</p>\n"
+#: instrview.cpp:426
+msgid "There is no instruction info in the profile data file."
+msgstr "There is no instruction info in the profile data file."
 
-#: tips.cpp:35
-msgid ""
-"<p>...that you can navigate in the Call Graph View using\n"
-"arrow keys? Use Up/Down to go one calling level up/down, alternating\n"
-"between calls and functions. Use Left/Right to change to siblings of a current\n"
-"selected call. To activate the current item, press Return.\n"
-"</p>\n"
-msgstr ""
-"<p>...that you can navigate in the Call Graph View using\n"
-"arrow keys? Use Up/Down to go one calling level up/down, alternating\n"
-"between calls and functions. Use Left/Right to change to siblings of a current\n"
-"selected call. To activate the current item, press Return.\n"
-"</p>\n"
+#: instrview.cpp:428
+msgid "For the Valgrind Calltree Skin, rerun with option"
+msgstr "For the Valgrind Calltree Skin, rerun with option"
 
-#: tips.cpp:44
-msgid ""
-"<p>...that you can rapidly locate a function by entering part of its\n"
-"name (case-insensitive) into the edit line of the toolbar\n"
-"and hit return?</p>\n"
-msgstr ""
-"<p>...that you can rapidly locate a function by entering part of its\n"
-"name (case-insensitive) into the edit line of the toolbar\n"
-"and hit return?</p>\n"
+#: instrview.cpp:429
+msgid "      --dump-instr=yes"
+msgstr "      --dump-instr=yes"
 
-#: tips.cpp:51
-msgid ""
-"<p>...that you can assign custom colors to \n"
-"ELF objects/C++ Classes/Source Files for graph coloring\n"
-"in <em>Settings->Configure KCachegrind...</em>?</p>\n"
-msgstr ""
-"<p>...that you can assign custom colours to \n"
-"ELF objects/C++ Classes/Source Files for graph colouring\n"
-"in <em>Settings->Configure KCachegrind...</em>?</p>\n"
+#: instrview.cpp:430
+msgid "To see (conditional) jumps, additionally specify"
+msgstr "To see (conditional) jumps, additionally specify"
 
-#: tips.cpp:58
-msgid ""
-"<p>...that you can see if debug info is available for a selected \n"
-"function by looking at the location label in the Info tab or\n"
-"the source listing header in the source tab?</p>\n"
-"<p>There must be the name of the source file (with extension).\n"
-"If KCachegrind still doesn't show the source, make sure that you\n"
-"have added the directory of the source file to the\n"
-"<em>Source Directories</em> list in the configuration.\n"
-msgstr ""
-"<p>...that you can see if debug info is available for a selected \n"
-"function by looking at the location label in the Info tab or\n"
-"the source listing header in the source tab?</p>\n"
-"<p>There must be the name of the source file (with extension).\n"
-"If KCachegrind still doesn't show the source, make sure that you\n"
-"have added the directory of the source file to the\n"
-"<em>Source Directories</em> list in the configuration.\n"
+#: instrview.cpp:431
+msgid "      --trace-jump=yes"
+msgstr "      --trace-jump=yes"
 
-#: tips.cpp:69
-msgid ""
-"<p>...that you can configure whether KCachgrind should\n"
-"show absolute event counts or relative ones (percentage display)?</p>\n"
-msgstr ""
-"<p>...that you can configure whether KCachgrind should\n"
-"show absolute event counts or relative ones (percentage display)?</p>\n"
+#: instrview.cpp:629
+msgid "There is an error trying to execute the command"
+msgstr "There is an error trying to execute the command"
 
-#: tips.cpp:75
-msgid ""
-"<p>...that you can configure the maximum number of items\n"
-"for all function lists in KCachegrind? Limiting the number\n"
-"of items is done to get a fast reacting GUI. The last item in\n"
-"the list will show you the number of skipped functions, together\n"
-"with a cost condition for these skipped functions.</p>\n"
-"<p>To activate a function with small costs, search for it and select\n"
-"it in the flat profile. Selecting functions with small cost will\n"
-"temporarily add them to the flat profile list.</p>\n"
-msgstr ""
-"<p>...that you can configure the maximum number of items\n"
-"for all function lists in KCachegrind? Limiting the number\n"
-"of items is done to get a fast reacting GUI. The last item in\n"
-"the list will show you the number of skipped functions, together\n"
-"with a cost condition for these skipped functions.</p>\n"
-"<p>To activate a function with small costs, search for it and select\n"
-"it in the flat profile. Selecting functions with small cost will\n"
-"temporarily add them to the flat profile list.</p>\n"
+#: instrview.cpp:634 instrview.cpp:900
+msgid "Check that you have installed 'objdump'."
+msgstr "Check that you have installed 'objdump'."
 
-#: tips.cpp:87
-msgid ""
-"<p>...that the Coverage tab - in contrast to the Call Lists tab -\n"
-"shows <em>all</em> functions that are calling the selected function\n"
-"(upper part) / are called by the selected function (bottom part),\n"
-"no matter how many function are between them on the stack?</p>\n"
-"<p>Examples:</p>\n"
-"<p>An entry in the upper list for function foo1() with a value of 50%\n"
-"with function bar() selected means that 50% of all the cost of function\n"
-"bar() happened while called from function foo1().</p>\n"
-"<p>An entry in the bottom list for function foo2() with a value of 50%\n"
-"with function bar() selected means that 50% of all the cost of function\n"
-"bar() happened while calling foo2() from bar().</p>\n"
-msgstr ""
-"<p>...that the Coverage tab - in contrast to the Call Lists tab -\n"
-"shows <em>all</em> functions that are calling the selected function\n"
-"(upper part) / are called by the selected function (bottom part),\n"
-"no matter how many function are between them on the stack?</p>\n"
-"<p>Examples:</p>\n"
-"<p>An entry in the upper list for function foo1() with a value of 50%\n"
-"with function bar() selected means that 50% of all the cost of function\n"
-"bar() happened while called from function foo1().</p>\n"
-"<p>An entry in the bottom list for function foo2() with a value of 50%\n"
-"with function bar() selected means that 50% of all the cost of function\n"
-"bar() happened while calling foo2() from bar().</p>\n"
+#: instrview.cpp:636 instrview.cpp:902
+msgid "This utility can be found in the 'binutils' package."
+msgstr "This utility can be found in the 'binutils' package."
 
-#: tips.cpp:102
-msgid ""
-"<p>...that waiting for the tool tip inside of a tree map\n"
-"shows the list of names of the nested rectangles the mouse\n"
-"pointer is over?</p>\n"
-"<p>Items from this list can be selected by pressing the right\n"
-"mouse button.</p>\n"
-msgstr ""
-"<p>...that waiting for the tool tip inside of a tree map\n"
-"shows the list of names of the nested rectangles the mouse\n"
-"pointer is over?</p>\n"
-"<p>Items from this list can be selected by pressing the right\n"
-"mouse button.</p>\n"
+#: instrview.cpp:739
+msgid "(No Assembler)"
+msgstr "(No Assembler)"
 
-#: tips.cpp:111
+#: instrview.cpp:875
+#, c-format
 msgid ""
-"<p>...that you can constrain the cost counts shown to only a\n"
-"few parts of the whole trace by selecting these parts in the\n"
-"\"Trace Selection\" Dockable?</p>\n"
-"<p>To generate multiple parts in a profiling run with\n"
-"cachegrind, use e.g. option --cachedumps=xxx for parts\n"
-"of a length of xxx basic blocks (A basic block is a run\n"
-"of not-branching assembler statements inside of your program\n"
-"code).</p>\n"
+"_n: There is %n cost line without assembler code.\n"
+"There are %n cost lines without assembler code."
 msgstr ""
-"<p>...that you can constrain the cost counts shown to only a\n"
-"few parts of the whole trace by selecting these parts in the\n"
-"\"Trace Selection\" Dockable?</p>\n"
-"<p>To generate multiple parts in a profiling run with\n"
-"cachegrind, use e.g. option --cachedumps=xxx for parts\n"
-"of a length of xxx basic blocks (A basic block is a run\n"
-"of not-branching assembler statements inside of your program\n"
-"code).</p>\n"
-
-#: configdlg.cpp:60
-msgid "Source Files"
-msgstr "Source Files"
-
-#: configdlg.cpp:61
-msgid "C++ Classes"
-msgstr "C++ Classes"
+"There is %n cost line without assembler code.\n"
+"There are %n cost lines without assembler code."
 
-#: configdlg.cpp:62
-msgid "Function (no Grouping)"
-msgstr "Function (no Grouping)"
+#: instrview.cpp:877
+msgid "This happens because the code of"
+msgstr "This happens because the code of"
 
-#: configdlg.cpp:157 configdlg.cpp:350 configdlg.cpp:371
-msgid "(always)"
-msgstr "(always)"
+#: instrview.cpp:880
+msgid "does not seem to match the profile data file."
+msgstr "does not seem to match the profile data file."
 
-#: configdlg.cpp:210
-msgid "KCachegrind Configuration"
-msgstr "KCachegrind Configuration"
+#: instrview.cpp:883
+msgid "Are you using an old profile data file or is the above mentioned"
+msgstr "Are you using an old profile data file or is the above mentioned"
 
-#: configdlg.cpp:211
-msgid ""
-"The Maximum Number of List Items should be below 500.The previous set value "
-"(%1) will still be used."
-msgstr ""
-"The Maximum Number of List Items should be below 500.The previous set value "
-"(%1) will still be used."
+#: instrview.cpp:885
+msgid "ELF object from an updated installation/another machine?"
+msgstr "ELF object from an updated installation/another machine?"
 
-#: configdlg.cpp:384
-msgid "Choose Source Folder"
-msgstr "Choose Source Folder"
+#: instrview.cpp:893
+msgid "There seems to be an error trying to execute the command"
+msgstr "There seems to be an error trying to execute the command"
 
-#: partgraph.cpp:167
-#, c-format
-msgid "Profile Part %1"
-msgstr "Profile Part %1"
+#: instrview.cpp:898
+msgid "Check that the ELF object used in the command exists."
+msgstr "Check that the ELF object used in the command exists."
 
-#: partgraph.cpp:226
-msgid "(no trace)"
-msgstr "(no trace)"
+#: partlistitem.cpp:49
+msgid " (Thread %1)"
+msgstr " (Thread %1)"
 
-#: partgraph.cpp:229
-msgid "(no part)"
-msgstr "(no part)"
+#: partlistitem.cpp:56
+msgid "(none)"
+msgstr "(none)"
 
-#: partview.cpp:51
-msgid "Comment"
-msgstr "Comment"
+#: main.cpp:38
+msgid "Run <exec> under cachegrind"
+msgstr "Run <exec> under cachegrind"
 
-#: partview.cpp:73
-msgid ""
-"<b>Trace Part List</b>"
-"<p>This list shows all trace parts of the loaded trace. For each part, the "
-"self/inclusive cost of the current selected function, spent in the part, is "
-"shown; percentage costs are always relative to the total cost <em>"
-"of the part</em> (not to the whole trace as in the Trace Part Overview). Also "
-"shown are the calls happening to/from the current function inside of the trace "
-"part.</p>"
-"<p>By choosing one or more trace parts from the list, the costs shown all over "
-"KCachegrind will only be the ones spent in the selected part(s). If no list "
-"selection is shown, in fact all trace parts are selected implicitly.</p>"
-"<p>This is a multi-selection list. You can select ranges by dragging the mouse "
-"or use SHIFT/CTRL modifiers. Selection/Deselection of trace parts can also be "
-"done by using the Trace Part Overview Dockable. This one also supports multiple "
-"selection.</p>"
-"<p>Note that the list is hidden if only one trace part is loaded.</p>"
-msgstr ""
-"<b>Trace Part List</b>"
-"<p>This list shows all trace parts of the loaded trace. For each part, the "
-"self/inclusive cost of the current selected function, spent in the part, is "
-"shown; percentage costs are always relative to the total cost <em>"
-"of the part</em> (not to the whole trace as in the Trace Part Overview). Also "
-"shown are the calls happening to/from the current function inside of the trace "
-"part.</p>"
-"<p>By choosing one or more trace parts from the list, the costs shown all over "
-"KCachegrind will only be the ones spent in the selected part(s). If no list "
-"selection is shown, in fact all trace parts are selected implicitly.</p>"
-"<p>This is a multi-selection list. You can select ranges by dragging the mouse "
-"or use SHIFT/CTRL modifiers. Selection/Deselection of trace parts can also be "
-"done by using the Trace Part Overview Dockable. This one also supports multiple "
-"selection.</p>"
-"<p>Note that the list is hidden if only one trace part is loaded.</p>"
+#: main.cpp:39
+msgid "Show information of this trace"
+msgstr "Show information of this trace"
 
-#: partview.cpp:106
-msgid "Select '%1'"
-msgstr "Select '%1'"
+#: main.cpp:46
+msgid "KCachegrind"
+msgstr "KCachegrind"
 
-#: partview.cpp:107
-msgid "Hide '%1'"
-msgstr "Hide '%1'"
+#: main.cpp:48
+msgid "TDE Frontend for Cachegrind"
+msgstr "TDE Frontend for Cachegrind"
 
-#: partview.cpp:111
-msgid "Hide Selected"
-msgstr "Hide Selected"
+#: main.cpp:50
+msgid "(C) 2002, 2003, 2004"
+msgstr "(C) 2002, 2003, 2004"
 
-#: partview.cpp:112
-msgid "Show All"
-msgstr "Show All"
+#: main.cpp:53
+msgid "Author/Maintainer"
+msgstr "Author/Maintainer"
 
 #~ msgid "(unnamed)"
 #~ msgstr "(unnamed)"
diff --git a/tde-i18n-en_GB/messages/tdesdk/tdefile_cpp.po b/tde-i18n-en_GB/messages/tdesdk/tdefile_cpp.po
index 4a0b9229b78..f8e55c7e915 100644
--- a/tde-i18n-en_GB/messages/tdesdk/tdefile_cpp.po
+++ b/tde-i18n-en_GB/messages/tdesdk/tdefile_cpp.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_cpp\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-07-01 14:45+0100\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdesdk/tdefile_diff.po b/tde-i18n-en_GB/messages/tdesdk/tdefile_diff.po
index b0a187854f2..fc5937f0196 100644
--- a/tde-i18n-en_GB/messages/tdesdk/tdefile_diff.po
+++ b/tde-i18n-en_GB/messages/tdesdk/tdefile_diff.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_diff\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-07-01 14:44+0100\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdesdk/tdefile_po.po b/tde-i18n-en_GB/messages/tdesdk/tdefile_po.po
index 72ff5d6c8f7..891048dce9c 100644
--- a/tde-i18n-en_GB/messages/tdesdk/tdefile_po.po
+++ b/tde-i18n-en_GB/messages/tdesdk/tdefile_po.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2002-07-13 03:30+0100\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdesdk/tdefile_ts.po b/tde-i18n-en_GB/messages/tdesdk/tdefile_ts.po
index 50d23e99e1a..8b7a062b963 100644
--- a/tde-i18n-en_GB/messages/tdesdk/tdefile_ts.po
+++ b/tde-i18n-en_GB/messages/tdesdk/tdefile_ts.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_ts\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2003-11-01 02:14+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdesdk/tdeio_svn.po b/tde-i18n-en_GB/messages/tdesdk/tdeio_svn.po
index e4e513956f9..107641194e9 100644
--- a/tde-i18n-en_GB/messages/tdesdk/tdeio_svn.po
+++ b/tde-i18n-en_GB/messages/tdesdk/tdeio_svn.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_svn\n"
-"POT-Creation-Date: 2006-02-18 03:52+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-05-13 13:26+0100\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-en_GB/messages/tdesdk/umbrello.po b/tde-i18n-en_GB/messages/tdesdk/umbrello.po
index 073f20f5681..abd228b59a1 100644
--- a/tde-i18n-en_GB/messages/tdesdk/umbrello.po
+++ b/tde-i18n-en_GB/messages/tdesdk/umbrello.po
@@ -7,15 +7,1058 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2006-01-29 00:02+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
+#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
+#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
+#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
+#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
+#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
+#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
+#: rc.cpp:207 rc.cpp:445 rc.cpp:492
+#, no-c-format
+msgid "Documentation"
+msgstr "Documentation"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Jonathan Riddell"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kde-en-gb@jriddell.org"
+
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Align Left"
+
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Align Right"
+
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Align Top"
+
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Align Bottom"
+
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "AlignQt::Vertical Middle"
+msgstr "Align Vertical Middle"
+
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "AlignQt::Horizontal Middle"
+msgstr "Align Horizontal Middle"
+
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "AlignQt::Vertical Distribute"
+msgstr "Align Vertical Middle"
+
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "AlignQt::Horizontal Distribute"
+msgstr "Align Horizontal Middle"
+
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. You "
+"can not align associations."
+msgstr ""
+"For alignment you have to select at least 2 objects like classes or actors. You "
+"can not align associations."
+
+#: tips.txt:3
+msgid ""
+"<p>Welcome to Umbrello.</p>\n"
+"<p>UML diagrams let you design and document object oriented software.  <a "
+"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
+"using UML.</p>\n"
+msgstr ""
+"<p>Welcome to Umbrello.</p>\n"
+"<p>UML diagrams let you design and document object oriented software.  <a "
+"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
+"using UML.</p>\n"
+
+#: tips.txt:9
+msgid ""
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
+"code generation, externalizable folders, ability to change interfaces into "
+"classes, and more.</p>\n"
+msgstr ""
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
+"code generation, externalizable folders, ability to change interfaces into "
+"classes, and more.</p>\n"
+
+#: tips.txt:14
+msgid ""
+"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
+"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
+"Settings.</p>\n"
+msgstr ""
+"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
+"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
+"Settings.</p>\n"
+
+#: tips.txt:19
+msgid ""
+"<p>Most diagram items can not be resized, they will resize themselves to fit to "
+"their contents.\n"
+"Boxes, notes and sequence diagram messages can be resized, just click and drag "
+"on the red square.</p>\n"
+msgstr ""
+"<p>Most diagram items can not be resized, they will resize themselves to fit to "
+"their contents.\n"
+"Boxes, notes and sequence diagram messages can be resized, just click and drag "
+"on the red square.</p>\n"
+
+#: tips.txt:25
+msgid ""
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
+msgstr ""
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
+
+#: tips.txt:30
+msgid ""
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
+msgstr ""
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
+
+#: tips.txt:37
+msgid ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
+"Double click one for\n"
+"the Properties dialogue.</p>\n"
+msgstr ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
+"Double click one for\n"
+"the Properties dialogue.</p>\n"
+
+#: tips.txt:43
+msgid ""
+"<p>Sequence diagram messages can act as constructors.  Click on the object box "
+"(rather than the vertical line) to make it a constructor.</p>\n"
+msgstr ""
+"<p>Sequence diagram messages can act as constructors.  Click on the object box "
+"(rather than the vertical line) to make it a constructor.</p>\n"
+
+#: tips.txt:48
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
+"again to create an automessage.</p>\n"
+msgstr ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
+"again to create an automessage.</p>\n"
+
+#: tips.txt:53
+msgid ""
+"<p>If on loading a foreign file nothing is displayed in the list view, try "
+"saving the model under a different name,\n"
+"closing, and reloading the saved file.  Usually the list view is then properly "
+"populated.\n"
+"</p>\n"
+msgstr ""
+"<p>If on loading a foreign file nothing is displayed in the list view, try "
+"saving the model under a different name,\n"
+"closing, and reloading the saved file.  Usually the list view is then properly "
+"populated.\n"
+"</p>\n"
+
+#: tips.txt:60
+msgid ""
+"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
+"pasted into KWord\n"
+"and other applications.</p>\n"
+msgstr ""
+"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
+"pasted into KWord\n"
+"and other applications.</p>\n"
+
+#: tips.txt:66
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
+msgstr ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
+
+#: tips.txt:71
+msgid ""
+"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>You can turn on autosaving in the Configure Umbrello dialogue.</p>\n"
+
+#: tips.txt:76
+msgid ""
+"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
+"Either add it to the bugs database with Report Bug from the Help menu\n"
+"or send it to the uml-devel mailing list.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
+".</li>\n"
+"</ul>\n"
+msgstr ""
+"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
+"Either add it to the bugs database with Report Bug from the Help menu\n"
+"or send it to the uml-devel mailing list.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
+".</li>\n"
+"</ul>\n"
+
+#: tips.txt:86
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+
+#: tips.txt:91
+msgid ""
+"<p>If you've found a bug in Umbrello, please let us know. \n"
+"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+msgstr ""
+"<p>If you've found a bug in Umbrello, please let us know. \n"
+"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+
+#: tips.txt:97
+msgid ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
+msgstr ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
+
+#: tips.txt:103
+msgid ""
+"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr ""
+"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+
+#: tips.txt:108
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the Code "
+"menu.</p>\n"
+msgstr ""
+"<p>You can create and setup a new class using the New Class Wizard in the Code "
+"menu.</p>\n"
+
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Externalise Folder"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
+#: umlviewimageexportermodel.cpp:158
+#, c-format
+msgid "There was a problem saving file: %1"
+msgstr "There was a problem saving file: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Save Error"
+
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Enter Model Name"
+
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Enter the new name of the model:"
+
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Views"
+
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"The name you entered was invalid.\n"
+"Creation process has been cancelled."
+
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Name Not Valid"
+
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Name Not Unique"
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Use Name"
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Enter New Name"
+
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"The name you entered was not unique!\n"
+"Creation process has been cancelled."
+
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Creation cancelled"
+
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Loading listview..."
+
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "The folder must be emptied before it can be deleted."
+
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Folder Not Empty"
+
+#: codegenerator.cpp:473
+msgid ""
+"Cannot open file %1 for writing. Please make sure the folder exists and you "
+"have permissions to write to it."
+msgstr ""
+"Cannot open file %1 for writing. Please make sure the folder exists and you "
+"have permissions to write to it."
+
+#: codegenerator.cpp:473
+msgid "Cannot Open File"
+msgstr "Cannot Open File"
+
+#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
+msgid ""
+"Cannot create the folder:\n"
+msgstr ""
+"Cannot create the folder:\n"
+
+#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
+msgid ""
+"\n"
+"Please check the access rights"
+msgstr ""
+"\n"
+"Please check the access rights"
+
+#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+msgid "Cannot Create Folder"
+msgstr "Cannot Create Folder"
+
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagram: %2 Page %1"
+
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Enter State Name"
+
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Enter the name of the new state:"
+
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "new state"
+
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Enter Activity Name"
+
+#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
+#: toolbarstateother.cpp:144 umlview.cpp:2546
+msgid "Enter the name of the new activity:"
+msgstr "Enter the name of the new activity:"
+
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "new activity"
+
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Enter Diagram Name"
+
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Enter the new name of the diagram:"
+
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Delete Diagram?"
+
+#: operation.cpp:185
+msgid "new_parameter"
+msgstr "new_parameter"
+
+#: listpopupmenu.cpp:695 stereotype.cpp:76
+msgid "Stereotype"
+msgstr "Stereotype"
+
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Enter name:"
+msgstr "Enter name:"
+
+#: codeimport/classimport.cpp:34
+#, fuzzy
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importing file: %1"
+
+#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
+#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
+#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
+#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
+#: umlviewimageexporterall.cpp:73
+msgid "Ready."
+msgstr "Ready."
+
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Is the scope %1 a namespace or a class?"
+
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++ Import Requests Your Help"
+
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Namespace"
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 249
+#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
+#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
+#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
+#, no-c-format
+msgid "Class"
+msgstr "Class"
+
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Internal Error"
+
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Syntax Error before '%1'"
+
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Parse Error before '%1'"
+
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
+
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "expression expected"
+
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Declaration syntax error"
+
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} expected"
+
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "namespace expected"
+
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ expected"
+
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Namespace name expected"
+
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Need a type specifier to declare"
+
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "expected a declaration"
+
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Constant expression expected"
+
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' expected"
+
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "} missing"
+
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Member initialisers expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Base class specifier expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Initialiser clause expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Identifier expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Type id expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Class name expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "condition expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "statement expected"
+
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "for initialisation expected"
+
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "catch expected"
+
+#: uml.cpp:179
+msgid "&Export model to DocBook"
+msgstr ""
+
+#: uml.cpp:182
+msgid "&Export model to XHTML"
+msgstr ""
+
+#: uml.cpp:186
+msgid "&New Class Wizard..."
+msgstr "&New Class Wizard..."
+
+#: uml.cpp:188
+msgid "&Add Default Datatypes for Active Language"
+msgstr "&Add Default Datatypes for Active Language"
+
+#: uml.cpp:193
+msgid "&Code Generation Wizard..."
+msgstr "&Code Generation Wizard..."
+
+#: uml.cpp:195
+msgid "&Generate All Code"
+msgstr "&Generate All Code"
+
+#: uml.cpp:198
+msgid "&Import Classes..."
+msgstr "&Import Classes..."
+
+#: uml.cpp:201
+msgid "Creates a new document"
+msgstr "Creates a new document"
+
+#: uml.cpp:202
+msgid "Opens an existing document"
+msgstr "Opens an existing document"
+
+#: uml.cpp:203
+msgid "Opens a recently used file"
+msgstr "Opens a recently used file"
+
+#: uml.cpp:204
+msgid "Saves the document"
+msgstr "Saves the document"
+
+#: uml.cpp:205
+msgid "Saves the document as..."
+msgstr "Saves the document as..."
+
+#: uml.cpp:206
+msgid "Closes the document"
+msgstr "Closes the document"
+
+#: uml.cpp:207
+msgid "Prints out the document"
+msgstr "Prints out the document"
+
+#: uml.cpp:208
+msgid "Quits the application"
+msgstr "Quits the application"
+
+#: uml.cpp:209
+msgid "Exports the model to the docbook format"
+msgstr ""
+
+#: uml.cpp:210
+msgid "Exports the model to the XHTML format"
+msgstr ""
+
+#: uml.cpp:211
+msgid "Cuts the selected section and puts it to the clipboard"
+msgstr "Cuts the selected section and puts it to the clipboard"
+
+#: uml.cpp:212
+msgid "Copies the selected section to the clipboard"
+msgstr "Copies the selected section to the clipboard"
+
+#: uml.cpp:213
+msgid "Pastes the contents of the clipboard"
+msgstr "Pastes the contents of the clipboard"
+
+#: uml.cpp:214
+msgid "Set the default program preferences"
+msgstr "Set the default program preferences"
+
+#: uml.cpp:216
+msgid "Delete &Selected"
+msgstr "Delete &Selected"
+
+#: uml.cpp:224
+msgid "&Class Diagram..."
+msgstr "&Class Diagram..."
+
+#: uml.cpp:228
+msgid "&Autolayout..."
+msgstr "&Autolayout..."
+
+#: uml.cpp:231
+msgid "&Sequence Diagram..."
+msgstr "&Sequence Diagram..."
+
+#: uml.cpp:234
+msgid "C&ollaboration Diagram..."
+msgstr "C&ollaboration Diagram..."
+
+#: uml.cpp:237
+msgid "&Use Case Diagram..."
+msgstr "&Use Case Diagram..."
+
+#: uml.cpp:240
+msgid "S&tate Diagram..."
+msgstr "S&tate Diagram..."
+
+#: uml.cpp:243
+msgid "&Activity Diagram..."
+msgstr "&Activity Diagram..."
+
+#: uml.cpp:246
+msgid "Co&mponent Diagram..."
+msgstr "Co&mponent Diagram..."
+
+#: uml.cpp:250
+msgid "&Deployment Diagram..."
+msgstr "&Deployment Diagram..."
+
+#: uml.cpp:254
+msgid "&Entity Relationship Diagram..."
+msgstr "&Entity Relationship Diagram..."
+
+#: uml.cpp:258
+msgid "&Clear Diagram"
+msgstr "&Clear Diagram"
+
+#: uml.cpp:260
+msgid "&Snap to Grid"
+msgstr "&Snap to Grid"
+
+#: uml.cpp:262
+msgid "S&how Grid"
+msgstr "S&how Grid"
+
+#: uml.cpp:265
+msgid "&Hide Grid"
+msgstr "&Hide Grid"
+
+#: uml.cpp:269
+msgid "&Export as Picture..."
+msgstr "&Export as Picture..."
+
+#: uml.cpp:271
+#, fuzzy
+msgid "Export &All Diagrams as Pictures..."
+msgstr "Export All Diagrams as Images"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Properties"
+
+#: uml.cpp:286
+msgid "&Zoom Slider"
+msgstr "&Zoom Slider"
+
+#: uml.cpp:289
+#, c-format
+msgid "Z&oom to 100%"
+msgstr "Z&oom to 100%"
+
+#: uml.cpp:295
+msgid "&Move Tab Left"
+msgstr "&Move Tab Left"
+
+#: uml.cpp:296
+msgid "&Move Tab Right"
+msgstr "&Move Tab Right"
+
+#: uml.cpp:308
+msgid "Select Diagram on Left"
+msgstr "Select Diagram on Left"
+
+#: uml.cpp:309
+msgid "Select Diagram on Right"
+msgstr "Select Diagram on Right"
+
+#: uml.cpp:327
+msgid "&Windows"
+msgstr "&Windows"
+
+#: uml.cpp:347
+#, c-format
+msgid " &33%"
+msgstr " &33%"
+
+#: uml.cpp:348
+#, c-format
+msgid " &50%"
+msgstr " &50%"
+
+#: uml.cpp:349
+#, c-format
+msgid " &75%"
+msgstr " &75%"
+
+#: uml.cpp:350
+#, c-format
+msgid "&100%"
+msgstr "&100%"
+
+#: uml.cpp:351
+#, c-format
+msgid "1&50%"
+msgstr "1&50%"
+
+#: uml.cpp:352
+#, c-format
+msgid "&200%"
+msgstr "&200%"
+
+#: uml.cpp:353
+#, c-format
+msgid "3&00%"
+msgstr "3&00%"
+
+#: uml.cpp:394
+msgid "Diagram Toolbar"
+msgstr "Diagram Toolbar"
+
+#: uml.cpp:398
+msgid "Alignment Toolbar"
+msgstr "Alignment Toolbar"
+
+#: listpopupmenu.cpp:615 uml.cpp:420
+msgid "Class Diagram..."
+msgstr "Class Diagram..."
+
+#: listpopupmenu.cpp:618 uml.cpp:421
+msgid "Sequence Diagram..."
+msgstr "Sequence Diagram..."
+
+#: listpopupmenu.cpp:619 uml.cpp:422
+msgid "Collaboration Diagram..."
+msgstr "Collaboration Diagram..."
+
+#: listpopupmenu.cpp:551 uml.cpp:423
+msgid "Use Case Diagram..."
+msgstr "Use Case Diagram..."
+
+#: listpopupmenu.cpp:616 uml.cpp:424
+msgid "State Diagram..."
+msgstr "State Diagram..."
+
+#: listpopupmenu.cpp:617 uml.cpp:425
+msgid "Activity Diagram..."
+msgstr "Activity Diagram..."
+
+#: listpopupmenu.cpp:521 uml.cpp:426
+msgid "Component Diagram..."
+msgstr "Component Diagram..."
+
+#: listpopupmenu.cpp:528 uml.cpp:427
+msgid "Deployment Diagram..."
+msgstr "Deployment Diagram..."
+
+#: listpopupmenu.cpp:541 uml.cpp:428
+msgid "Entity Relationship Diagram..."
+msgstr "Entity Relationship Diagram..."
+
+#: uml.cpp:458
+msgid "&Tree View"
+msgstr "&Tree View"
+
+#: uml.cpp:467
+msgid "&Documentation"
+msgstr "&Documentation"
+
+#: uml.cpp:479 uml.cpp:664 uml.cpp:692
+msgid "Opening file..."
+msgstr "Opening file..."
+
+#: uml.cpp:650
+msgid "Creating new document..."
+msgstr "Creating new document..."
+
+#: uml.cpp:673
+msgid ""
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
+"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi|Uncompressed XMI Files (*.xmi)\n"
+"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
+"*.mdl|Rose model files"
+msgstr ""
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
+"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi|Uncompressed XMI Files (*.xmi)\n"
+"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
+"*.mdl|Rose model files"
+
+#: uml.cpp:677
+msgid "Open File"
+msgstr "Open File"
+
+#: uml.cpp:716
+msgid "Saving file..."
+msgstr "Saving file..."
+
+#: uml.cpp:727
+msgid "Saving file with a new filename..."
+msgstr "Saving file with a new filename..."
+
+#: uml.cpp:732
+msgid ""
+"*.xmi|XMI File\n"
+"*.xmi.tgz|Gzip Compressed XMI File\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
+"*|All Files"
+msgstr ""
+"*.xmi|XMI File\n"
+"*.xmi.tgz|Gzip Compressed XMI File\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
+"*|All Files"
+
+#: uml.cpp:740
+msgid ""
+"The file %1 exists.\n"
+"Do you wish to overwrite it?"
+msgstr ""
+"The file %1 exists.\n"
+"Do you wish to overwrite it?"
+
+#: uml.cpp:740
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#: uml.cpp:764
+msgid "Closing file..."
+msgstr "Closing file..."
+
+#: uml.cpp:772
+msgid "Printing..."
+msgstr "Printing..."
+
+#: uml.cpp:779
+#, c-format
+msgid "Print %1"
+msgstr "Print %1"
+
+#: uml.cpp:787
+msgid "Exiting..."
+msgstr "Exiting..."
+
+#: uml.cpp:823
+msgid "Cutting selection..."
+msgstr "Cutting selection..."
+
+#: uml.cpp:836
+msgid "Copying selection to clipboard..."
+msgstr "Copying selection to clipboard..."
+
+#: uml.cpp:844
+msgid "Inserting clipboard contents..."
+msgstr "Inserting clipboard contents..."
+
+#: uml.cpp:849
+msgid ""
+"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
+"may be of the wrong type to be pasted here."
+msgstr ""
+"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
+"may be of the wrong type to be pasted here."
+
+#: clipboard/umlclipboard.cpp:691 uml.cpp:851
+msgid "Paste Error"
+msgstr "Paste Error"
+
+#: uml.cpp:863
+msgid "Toggling toolbar..."
+msgstr "Toggling toolbar..."
+
+#: uml.cpp:878
+msgid "Toggle the statusbar..."
+msgstr "Toggle the statusbar..."
+
+#: uml.cpp:1186
+msgid "Cannot view code until you generate some first."
+msgstr "Cannot view code until you generate some first."
+
+#: uml.cpp:1186 uml.cpp:1189
+msgid "Cannot View Code"
+msgstr "Cannot View Code"
+
+#: uml.cpp:1189
+msgid "Cannot view code from simple code writer."
+msgstr "Cannot view code from simple code writer."
+
+#: uml.cpp:1387
+msgid "*.idl|IDL Files (*.idl)"
+msgstr "*.idl|IDL Files (*.idl)"
+
+#: uml.cpp:1389
+msgid "*.py|Python Files (*.py)"
+msgstr "*.py|Python Files (*.py)"
+
+#: uml.cpp:1391
+msgid "*.java|Java Files (*.java)"
+msgstr "*.java|Java Files (*.java)"
+
+#: uml.cpp:1393
+#, fuzzy
+msgid "*.pas|Pascal Files (*.pas)"
+msgstr "*.java|Java Files (*.java)"
+
+#: uml.cpp:1395
+msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
+msgstr "*.ads *.ada|Ada Files (*.ads *.ada)"
+
+#: uml.cpp:1397
+msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
+msgstr "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
+
+#: uml.cpp:1399
+msgid "All Files"
+msgstr "All Files"
+
+#: uml.cpp:1401
+msgid "Select Code to Import"
+msgstr "Select Code to Import"
+
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Name"
+msgstr "Name"
+
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "That is an invalid name."
+msgstr "That is an invalid name."
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Invalid Name"
+
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"This is a reserved keyword for the language of the configured code generator."
+
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Reserved Keyword"
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
+msgid "That name is already being used."
+msgstr "That name is already being used."
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
+#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
+msgid "Not a Unique Name"
+msgstr "Not a Unique Name"
+
 #: worktoolbar.cpp:245
 msgid "Object"
 msgstr "Object"
@@ -85,14 +1128,6 @@ msgstr "Composition"
 msgid "Use Case"
 msgstr "Use Case"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "Class"
-
 #: listpopupmenu.cpp:1030 worktoolbar.cpp:263
 msgid "Initial State"
 msgstr "Initial State"
@@ -205,383 +1240,381 @@ msgstr "UNDEFINED"
 msgid "Select"
 msgstr "Select"
 
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
-msgstr ""
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "new_association"
 
-#: umlwidgetcontroller.cpp:379
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel resize."
-msgstr ""
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "new_attribute"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Initial activity"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "new_template"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "End activity"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "new_operation"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
-#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
-#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
-#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
-#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
-#: rc.cpp:225
-#, no-c-format
-msgid "General"
-msgstr "General"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "new_literal"
 
-#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
-#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
-#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
-msgid "General Properties"
-msgstr "General Properties"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "new_field"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Activity type:"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Export as Picture..."
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Activity name:"
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
-#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
-#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
-#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
-#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
-#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
-#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
-#: rc.cpp:207 rc.cpp:445 rc.cpp:492
-#, no-c-format
-msgid "Documentation"
-msgstr "Documentation"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello UML Modeller Authors"
 
-#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
-#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
-#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
-msgid "Font Settings"
-msgstr "Font Settings"
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "File to open"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
-#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
-#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
-#: listpopupmenu.cpp:750
-msgid "Color"
-msgstr "Colour"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Widget Colours"
+#: docgenerators/main.cpp:64
+#, fuzzy
+msgid ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Destination File Already Exists"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello UML Modeller Authors"
 
-#: dialogs/overwritedialogue.cpp:31
+#: umlviewimageexporter.cpp:46
+#, fuzzy
+msgid "Exporting view..."
+msgstr "Exiting..."
+
+#: umlviewimageexporter.cpp:50
 msgid ""
-"The file %1 already exists in %2.\n"
-"\n"
-"Umbrello can overwrite the file, generate a similar\n"
-"file name or not generate this file."
+"An error happened when exporting the image:\n"
 msgstr ""
-"The file %1 already exists in %2.\n"
-"\n"
-"Umbrello can overwrite the file, generate a similar\n"
-"file name or not generate this file."
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Apply to all remaining files"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "File Already Exists"
 
 #: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
 msgid "&Overwrite"
 msgstr "&Overwrite"
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Generate Similar File Name"
+#: clipboard/umlclipboard.cpp:687
+msgid ""
+"At least one of the items in the clipboard could not be pasted because an item "
+"of the same name already exists.  Any other items have been pasted."
+msgstr ""
+"At least one of the items in the clipboard could not be pasted because an item "
+"of the same name already exists.  Any other items have been pasted."
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Do Not Generate File"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML Model"
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Activities"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logical View"
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "New Activity..."
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Use Case View"
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Rename"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Component View"
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "New Activity"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Deployment View"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "Enter the name of the new activity:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Entity Relationship Model"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "new activity"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Datatypes"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Rename Activity"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Enter the new name of the activity:"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "The file %1 does not exist."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
-msgstr "Code Generation Options"
+#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
+#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+msgid "Load Error"
+msgstr "Load Error"
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generate"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "The file %1 seems to be corrupted."
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Finish"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "There was no XMI file found in the compressed file %1."
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Code Generated"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "There was a problem loading the extracted file: %1"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Not Generated"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "There was a problem loading file: %1"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Not Yet Generated"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "There was a problem uploading file: %1"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "The folder %1 does not exist. Do you want to create it now?"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "use case diagram"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Output Folder Does Not Exist"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "class diagram"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Create Folder"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "sequence diagram"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Do Not Create"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "collaboration diagram"
 
-#: dialogs/codegenerationwizard.cpp:168
-msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
-msgstr ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "state diagram"
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Error Creating Folder"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "activity diagram"
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Please select a valid folder."
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "component diagram"
 
-#: dialogs/codegenerationwizard.cpp:184
-msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
-msgstr ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "deployment diagram"
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Error Writing to Output Folder"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "entity relationship diagram"
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 does not seem to be a folder. Please choose a valid folder."
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "That is an invalid name for a diagram."
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Please Choose Valid Folder"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "A diagram is already using that name."
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Initial state"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Are you sure you want to delete diagram %1?"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "End state"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Delete Diagram"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "State type:"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Setting up the document..."
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "State name:"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Resolving object references..."
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Widget Colour"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Loading UML elements..."
 
-#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
-#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
-#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
-msgid "General Settings"
-msgstr "General Settings"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Loading diagrams..."
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Display"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Classes Display Options"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagram Colours"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not add "
+"it again."
+msgstr ""
+"An operation with the same name and signature already exists. You can not add "
+"it again."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "The name you have entered is invalid."
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Add Base Class"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Invalid Name"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Add Derived Class"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "The name you have entered is not unique."
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Add Operation"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1918
-#: umllistview.cpp:1925 umllistview.cpp:2162
-msgid "Name Not Unique"
-msgstr "Name Not Unique"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Add Attribute"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Code Viewer"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Add Base Interface"
+
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Add Derived Interface"
+
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Base Classifiers"
+
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Derived Classifiers"
 
 #: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
 #: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
 msgid "Attributes"
 msgstr "Attributes"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&ew Attribute..."
-
 #: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
 #: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
 msgid "Operations"
 msgstr "Operations"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "N&ew Operation..."
-
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Templates"
-
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "N&ew Template..."
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid ""
+"An operation with that signature already exists in %1.\n"
+msgstr ""
+"An operation with that signature already exists in %1.\n"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Enum Literals"
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Choose a different name or parameter list."
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "N&ew Enum Literal..."
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Operation Name Invalid"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Entity Attributes"
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "The folderfile %1 does not exist."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "N&ew Entity Attribute..."
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "The folderfile %1 cannot be opened."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Properties"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Association Properties"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
+#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
+#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
+#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
+#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
+#: rc.cpp:225
 #, no-c-format
-msgid "Role Properties"
-msgstr "Role Properties"
-
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Display Options"
-
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Attribute Settings"
+msgid "General"
+msgstr "General"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Operation Settings"
+#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
+#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
+#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
+msgid "General Settings"
+msgstr "General Settings"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Templates Settings"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Roles"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Enum Literals Settings"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Role Settings"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Entity Attributes Settings"
+#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
+#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
+#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
+msgid "Font Settings"
+msgstr "Font Settings"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Contents Settings"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Association font"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Associations"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">No Options Available.</p>"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Class Associations"
+#. i18n: file dialogs/codeviewerdialogbase.ui line 21
+#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
+#, no-c-format
+msgid "Code Viewer"
+msgstr "Code Viewer"
 
 #: dialogs/umloperationdialog.cpp:50
 msgid "Operation Properties"
 msgstr "Operation Properties"
 
+#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
+#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
+#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
+msgid "General Properties"
+msgstr "General Properties"
+
 #: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
 #: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
 #: dialogs/umltemplatedialog.cpp:61
@@ -673,36 +1706,15 @@ msgstr ""
 msgid "You have entered an invalid operation name."
 msgstr "You have entered an invalid operation name."
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Operation Name Invalid"
-
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"An operation with that signature already exists in %1.\n"
-
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Choose a different name or parameter list."
-
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "new_class"
-
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "New Class"
-
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Class Attributes"
+#. i18n: file dialogs/diagrampropertiespage.ui line 61
+#: dialogs/assocgenpage.cpp:67 rc.cpp:408
+#, no-c-format
+msgid "Name:"
+msgstr "Name:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Class Operations"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Type:"
 
 #: dialogs/parmpropdlg.cpp:35
 msgid "Parameter Properties"
@@ -724,32 +1736,6 @@ msgstr ""
 "\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
 "is a parameter for reading and writing."
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Attribute Properties"
-
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Public"
-
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "You have entered an invalid attribute name."
-
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Attribute Name Invalid"
-
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr ""
-"The attribute name you have chosen is already being used in this operation."
-
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Attribute Name Not Unique"
-
 #: dialogs/classgenpage.cpp:50
 msgid "Class &name:"
 msgstr "Class &name:"
@@ -878,288 +1864,6 @@ msgstr ""
 msgid "Name is Not Unique"
 msgstr "Name is Not Unique"
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Entity Attribute Properties"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Default value:"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Length/Values:"
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Auto increment"
-
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Allow &null"
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attributes:"
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexing"
-
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&None"
-
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primary"
-
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Index"
-
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unique"
-
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "You have entered an invalid entity attribute name."
-
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Entity Attribute Name Invalid"
-
-#: dialogs/umlentityattributedialog.cpp:192
-msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Entity Attribute Name Not Unique"
-
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrams"
-
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
-
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Current diagram"
-
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&All diagrams"
-
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Select diagrams"
-
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Type of diagram"
-
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Selection"
-
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Collaboration"
-
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sequence"
-
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Deployment"
-
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
-
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "No diagrams selected."
-
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Role A Properties"
-
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Role B Properties"
-
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Role A Visibility"
-
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Role B Visibility"
-
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Role A Changeability"
-
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Role B Changeability"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rolename:"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Multiplicity:"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Public"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Private"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Protected"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementation"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Changeable"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Frozen"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Add only"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Line:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Fill:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "D&efault"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Use fill"
-
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Template Properties"
-
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "You have entered an invalid template name."
-
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Template Name Invalid"
-
-#: dialogs/umltemplatedialog.cpp:138
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Template Name Not Unique"
-
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Select Operation"
-
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Sequence number:"
-
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Class operation:"
-
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Custom operation:"
-
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Note Documentation"
-
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Contained Items"
-
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Association Properties"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Roles"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Role Settings"
-
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Association font"
-
 #: dialogs/settingsdlg.cpp:30
 msgid "Umbrello Setup"
 msgstr "Umbrello Setup"
@@ -1172,6 +1876,14 @@ msgstr "User Interface"
 msgid "User Interface Settings"
 msgstr "User Interface Settings"
 
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
+#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
+#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
+#: listpopupmenu.cpp:750
+msgid "Color"
+msgstr "Colour"
+
 #: dialogs/settingsdlg.cpp:54
 msgid "Line color:"
 msgstr "Line colour:"
@@ -1347,6 +2059,30 @@ msgstr "Default attribute scope:"
 msgid "Default operation scope:"
 msgstr "Default operation scope:"
 
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
+#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
+#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
+#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
+#, no-c-format
+msgid "Public"
+msgstr "Public"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
+#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
+#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
+#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
+#, no-c-format
+msgid "Private"
+msgstr "Private"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
+#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
+#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
+#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
+#, no-c-format
+msgid "Protected"
+msgstr "Protected"
+
 #: dialogs/settingsdlg.cpp:294
 msgid "Code Generation"
 msgstr "Code Generation"
@@ -1359,1272 +2095,623 @@ msgstr "Code Generation Settings"
 msgid "Code Viewer Settings"
 msgstr "Code Viewer Settings"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">No Options Available.</p>"
-
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Show"
-
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operatio&ns"
-
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Visibility"
-
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "O&peration signature"
-
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pac&kage"
-
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Att&ributes"
-
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereot&ype"
-
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Attr&ibute signature"
-
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Draw as circle"
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Name:"
-
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Type:"
-
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Externalise Folder"
-
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
-#: umlviewimageexportermodel.cpp:158
-#, c-format
-msgid "There was a problem saving file: %1"
-msgstr "There was a problem saving file: %1"
-
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
-msgstr "Save Error"
-
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Enter Model Name"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Associations"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Enter the new name of the model:"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Contained Items"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Views"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Widget Colours"
 
-#: umllistview.cpp:1907
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"The name you entered was invalid.\n"
-"Creation process has been cancelled."
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Display"
 
-#: umllistview.cpp:1908 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Name Not Valid"
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Display Options"
 
-#: umldoc.cpp:1067 umllistview.cpp:1917
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Attribute Settings"
 
-#: umldoc.cpp:1068 umllistview.cpp:1918
-msgid "Use Name"
-msgstr "Use Name"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Operation Settings"
 
-#: umldoc.cpp:1068 umllistview.cpp:1918
-msgid "Enter New Name"
-msgstr "Enter New Name"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Templates"
 
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"The name you entered was not unique!\n"
-"Creation process has been cancelled."
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Templates Settings"
 
-#: umllistview.cpp:2119 umllistview.cpp:2136 umllistview.cpp:2151
-msgid "Creation canceled"
-msgstr "Creation cancelled"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Enum Literals"
 
-#: umllistview.cpp:2339
-msgid "Loading listview..."
-msgstr "Loading listview..."
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Enum Literals Settings"
 
-#: umllistview.cpp:2671
-msgid "The folder must be emptied before it can be deleted."
-msgstr "The folder must be emptied before it can be deleted."
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Entity Attributes"
 
-#: umllistview.cpp:2672
-msgid "Folder Not Empty"
-msgstr "Folder Not Empty"
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Entity Attributes Settings"
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Name"
-msgstr "Name"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Contents Settings"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Enter operation name:"
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Class Associations"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Enter role name:"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
+#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#, no-c-format
+msgid "Role Properties"
+msgstr "Role Properties"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Enter multiplicity:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Entity Attribute Properties"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Enter association name:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Default value:"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Enter new text:"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Length/Values:"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ERROR"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Auto increment"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Change Text"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Allow &null"
 
-#: codegenerator.cpp:473
-msgid ""
-"Cannot open file %1 for writing. Please make sure the folder exists and you "
-"have permissions to write to it."
-msgstr ""
-"Cannot open file %1 for writing. Please make sure the folder exists and you "
-"have permissions to write to it."
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attributes:"
 
-#: codegenerator.cpp:473
-msgid "Cannot Open File"
-msgstr "Cannot Open File"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexing"
 
-#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Cannot create the folder:\n"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&None"
 
-#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
-msgid ""
-"\n"
-"Please check the access rights"
-msgstr ""
-"\n"
-"Please check the access rights"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primary"
 
-#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
-msgid "Cannot Create Folder"
-msgstr "Cannot Create Folder"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Index"
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Exiting..."
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unique"
 
-#: umlviewimageexporter.cpp:50
-msgid ""
-"An error happened when exporting the image:\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "You have entered an invalid entity attribute name."
 
-#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
-#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
-#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
-#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
-#: umlviewimageexporterall.cpp:73
-msgid "Ready."
-msgstr "Ready."
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Entity Attribute Name Invalid"
 
-#: umlviewimageexporter.cpp:66
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "File Already Exists"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Align Left"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Align Right"
-
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Align Top"
-
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Align Bottom"
-
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
-msgstr "Align Vertical Middle"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
-msgstr "Align Horizontal Middle"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Entity Attribute Name Not Unique"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Align Vertical Middle"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Line:"
 
-#: aligntoolbar.cpp:47
-#, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Align Horizontal Middle"
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Fill:"
 
-#: aligntoolbar.cpp:383
-msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
-msgstr ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "D&efault"
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Enter name:"
-msgstr "Enter name:"
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Use fill"
 
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "That is an invalid name."
-msgstr "That is an invalid name."
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Destination File Already Exists"
 
-#: object_factory.cpp:164
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"The file %1 already exists in %2.\n"
+"\n"
+"Umbrello can overwrite the file, generate a similar\n"
+"file name or not generate this file."
 msgstr ""
-"This is a reserved keyword for the language of the configured code generator."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Reserved Keyword"
-
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
-msgid "That name is already being used."
-msgstr "That name is already being used."
-
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
-#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
-msgid "Not a Unique Name"
-msgstr "Not a Unique Name"
-
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Cannot Create Folder"
-
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Can not save an empty diagram"
+"The file %1 already exists in %2.\n"
+"\n"
+"Umbrello can overwrite the file, generate a similar\n"
+"file name or not generate this file."
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr ""
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Apply to all remaining files"
 
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "new_actor"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Generate Similar File Name"
 
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "new_usecase"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Do Not Generate File"
 
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "new_package"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Initial state"
 
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "new_component"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "End state"
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "new_node"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "State type:"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "new_artifact"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "State name:"
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "new_interface"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Widget Colour"
 
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "new_datatype"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Activities"
 
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "new_enum"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&ew Attribute..."
 
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "new_entity"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "N&ew Operation..."
 
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "new_node"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "N&ew Template..."
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "new_association"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "N&ew Enum Literal..."
 
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "new_object"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "N&ew Entity Attribute..."
 
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Empty"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "new_class"
 
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Malformed argument"
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "New Class"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Unknown argument type"
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Class Attributes"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Illegal method name"
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Class Operations"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Unknown return type"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "New Activity..."
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Unspecified error"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Rename"
 
-#: codeimport/classimport.cpp:34
-#, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importing file: %1"
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "New Activity"
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Is the scope %1 a namespace or a class?"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Rename Activity"
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++ Import Requests Your Help"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Enter the new name of the activity:"
 
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Namespace"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrams"
 
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "expression expected"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Current diagram"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Declaration syntax error"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&All diagrams"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} expected"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Select diagrams"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "namespace expected"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Type of diagram"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ expected"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Selection"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Namespace name expected"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Collaboration"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Need a type specifier to declare"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sequence"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "expected a declaration"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Deployment"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Constant expression expected"
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "No diagrams selected."
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' expected"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Role A Properties"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} missing"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Role B Properties"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Member initialisers expected"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Role A Visibility"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Base class specifier expected"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Role B Visibility"
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Initialiser clause expected"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Role A Changeability"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Identifier expected"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Role B Changeability"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Type id expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
+#, no-c-format
+msgid "Rolename:"
+msgstr "Rolename:"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Class name expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
+#, no-c-format
+msgid "Multiplicity:"
+msgstr "Multiplicity:"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "condition expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
+#, no-c-format
+msgid "Implementation"
+msgstr "Implementation"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "statement expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
+#, no-c-format
+msgid "Changeable"
+msgstr "Changeable"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "for initialisation expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
+#, no-c-format
+msgid "Frozen"
+msgstr "Frozen"
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "catch expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
+#, no-c-format
+msgid "Add only"
+msgstr "Add only"
 
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Internal Error"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Attribute Properties"
 
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Syntax Error before '%1'"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Public"
 
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Parse Error before '%1'"
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "You have entered an invalid attribute name."
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Jonathan Riddell"
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Attribute Name Invalid"
 
-#: _translatorinfo.cpp:3
+#: dialogs/umlattributedialog.cpp:163
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kde-en-gb@jriddell.org"
-
-#: main.cpp:32 main.cpp:93
-msgid "Umbrello UML Modeller"
-msgstr "Umbrello UML Modeller"
-
-#: main.cpp:40
-msgid "File to open"
-msgstr "File to open"
-
-#: main.cpp:41
-msgid "export diagrams to extension and exit"
-msgstr "export diagrams to extension and exit"
-
-#: main.cpp:42
-msgid "the local directory to save the exported diagrams in"
-msgstr ""
-
-#: main.cpp:42
-msgid "the directory of the file"
+"The attribute name you have chosen is already being used in this operation."
 msgstr ""
+"The attribute name you have chosen is already being used in this operation."
 
-#: main.cpp:43
-msgid ""
-"keep the tree structure used to store the views in the document in the target "
-"directory"
-msgstr ""
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Attribute Name Not Unique"
 
-#: main.cpp:95
-msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
-msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Show"
 
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello UML Modeller Authors"
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operatio&ns"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello UML Modeller Authors"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Visibility"
 
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "File to open"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "O&peration signature"
 
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pac&kage"
 
-#: docgenerators/main.cpp:64
-#, fuzzy
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Att&ributes"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "Export as Picture..."
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereot&ype"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr ""
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Attr&ibute signature"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalisation"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Draw as circle"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Self Association"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Classes Display Options"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Collaboration Message"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagram Colours"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sequence Message"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "The name you have entered is invalid."
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Collaboration Self Message"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "The name you have entered is not unique."
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Sequence Self Message"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
+#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#, no-c-format
+msgid "Code Generation Options"
+msgstr "Code Generation Options"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realisation"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generate"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Uni Association"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Finish"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML Model"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Code Generated"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logical View"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Not Generated"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Use Case View"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Not Yet Generated"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Component View"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "The folder %1 does not exist. Do you want to create it now?"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Deployment View"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Output Folder Does Not Exist"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Entity Relationship Model"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Create Folder"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Datatypes"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Do Not Create"
 
-#: umldoc.cpp:229
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select another, "
+"valid, folder."
 msgstr ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "The file %1 does not exist."
-
-#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
-#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
-msgid "Load Error"
-msgstr "Load Error"
-
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "The file %1 seems to be corrupted."
-
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "There was no XMI file found in the compressed file %1."
-
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "There was a problem loading the extracted file: %1"
-
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "There was a problem loading file: %1"
-
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "There was a problem uploading file: %1"
-
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "use case diagram"
-
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "class diagram"
-
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "sequence diagram"
-
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "collaboration diagram"
-
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "state diagram"
-
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "activity diagram"
-
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "component diagram"
-
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "deployment diagram"
-
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "entity relationship diagram"
-
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "That is an invalid name for a diagram."
-
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "A diagram is already using that name."
-
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Are you sure you want to delete diagram %1?"
-
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Delete Diagram"
-
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Setting up the document..."
-
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Resolving object references..."
-
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Loading UML elements..."
-
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Loading diagrams..."
-
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosave%1"
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Rename cancelled"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select another, "
+"valid, folder."
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Renaming an item of listview type %1 is not yet implemented."
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Error Creating Folder"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Function Not Implemented"
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Please select a valid folder."
 
-#: umllistviewitem.cpp:478
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"The name you entered was invalid.\n"
-"Renaming process has been cancelled."
-
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "General Options"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Package is a namespace"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtual destructors"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Generate empty constructors"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Generate accessor methods"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operations are inline"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Accessors are inline"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Accessors are public"
-
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "new_attribute"
-
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "new_template"
-
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "new_operation"
-
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "new_literal"
-
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "new_field"
-
-#: uml.cpp:179
-msgid "&Export model to DocBook"
-msgstr ""
-
-#: uml.cpp:182
-msgid "&Export model to XHTML"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 
-#: uml.cpp:186
-msgid "&New Class Wizard..."
-msgstr "&New Class Wizard..."
-
-#: uml.cpp:188
-msgid "&Add Default Datatypes for Active Language"
-msgstr "&Add Default Datatypes for Active Language"
-
-#: uml.cpp:193
-msgid "&Code Generation Wizard..."
-msgstr "&Code Generation Wizard..."
-
-#: uml.cpp:195
-msgid "&Generate All Code"
-msgstr "&Generate All Code"
-
-#: uml.cpp:198
-msgid "&Import Classes..."
-msgstr "&Import Classes..."
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Error Writing to Output Folder"
 
-#: uml.cpp:201
-msgid "Creates a new document"
-msgstr "Creates a new document"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 does not seem to be a folder. Please choose a valid folder."
 
-#: uml.cpp:202
-msgid "Opens an existing document"
-msgstr "Opens an existing document"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Please Choose Valid Folder"
 
-#: uml.cpp:203
-msgid "Opens a recently used file"
-msgstr "Opens a recently used file"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Select Operation"
 
-#: uml.cpp:204
-msgid "Saves the document"
-msgstr "Saves the document"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Sequence number:"
 
-#: uml.cpp:205
-msgid "Saves the document as..."
-msgstr "Saves the document as..."
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Class operation:"
 
-#: uml.cpp:206
-msgid "Closes the document"
-msgstr "Closes the document"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Custom operation:"
 
-#: uml.cpp:207
-msgid "Prints out the document"
-msgstr "Prints out the document"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Template Properties"
 
-#: uml.cpp:208
-msgid "Quits the application"
-msgstr "Quits the application"
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "You have entered an invalid template name."
 
-#: uml.cpp:209
-msgid "Exports the model to the docbook format"
-msgstr ""
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Template Name Invalid"
 
-#: uml.cpp:210
-msgid "Exports the model to the XHTML format"
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
 
-#: uml.cpp:211
-msgid "Cuts the selected section and puts it to the clipboard"
-msgstr "Cuts the selected section and puts it to the clipboard"
-
-#: uml.cpp:212
-msgid "Copies the selected section to the clipboard"
-msgstr "Copies the selected section to the clipboard"
-
-#: uml.cpp:213
-msgid "Pastes the contents of the clipboard"
-msgstr "Pastes the contents of the clipboard"
-
-#: uml.cpp:214
-msgid "Set the default program preferences"
-msgstr "Set the default program preferences"
-
-#: uml.cpp:216
-msgid "Delete &Selected"
-msgstr "Delete &Selected"
-
-#: uml.cpp:224
-msgid "&Class Diagram..."
-msgstr "&Class Diagram..."
-
-#: uml.cpp:228
-msgid "&Autolayout..."
-msgstr "&Autolayout..."
-
-#: uml.cpp:231
-msgid "&Sequence Diagram..."
-msgstr "&Sequence Diagram..."
-
-#: uml.cpp:234
-msgid "C&ollaboration Diagram..."
-msgstr "C&ollaboration Diagram..."
-
-#: uml.cpp:237
-msgid "&Use Case Diagram..."
-msgstr "&Use Case Diagram..."
-
-#: uml.cpp:240
-msgid "S&tate Diagram..."
-msgstr "S&tate Diagram..."
-
-#: uml.cpp:243
-msgid "&Activity Diagram..."
-msgstr "&Activity Diagram..."
-
-#: uml.cpp:246
-msgid "Co&mponent Diagram..."
-msgstr "Co&mponent Diagram..."
-
-#: uml.cpp:250
-msgid "&Deployment Diagram..."
-msgstr "&Deployment Diagram..."
-
-#: uml.cpp:254
-msgid "&Entity Relationship Diagram..."
-msgstr "&Entity Relationship Diagram..."
-
-#: uml.cpp:258
-msgid "&Clear Diagram"
-msgstr "&Clear Diagram"
-
-#: uml.cpp:260
-msgid "&Snap to Grid"
-msgstr "&Snap to Grid"
-
-#: uml.cpp:262
-msgid "S&how Grid"
-msgstr "S&how Grid"
-
-#: uml.cpp:265
-msgid "&Hide Grid"
-msgstr "&Hide Grid"
-
-#: uml.cpp:269
-msgid "&Export as Picture..."
-msgstr "&Export as Picture..."
-
-#: uml.cpp:271
-#, fuzzy
-msgid "Export &All Diagrams as Pictures..."
-msgstr "Export All Diagrams as Images"
-
-#: uml.cpp:286
-msgid "&Zoom Slider"
-msgstr "&Zoom Slider"
-
-#: uml.cpp:289
-#, c-format
-msgid "Z&oom to 100%"
-msgstr "Z&oom to 100%"
-
-#: uml.cpp:295
-msgid "&Move Tab Left"
-msgstr "&Move Tab Left"
-
-#: uml.cpp:296
-msgid "&Move Tab Right"
-msgstr "&Move Tab Right"
-
-#: uml.cpp:308
-msgid "Select Diagram on Left"
-msgstr "Select Diagram on Left"
-
-#: uml.cpp:309
-msgid "Select Diagram on Right"
-msgstr "Select Diagram on Right"
-
-#: uml.cpp:327
-msgid "&Windows"
-msgstr "&Windows"
-
-#: uml.cpp:347
-#, c-format
-msgid " &33%"
-msgstr " &33%"
-
-#: uml.cpp:348
-#, c-format
-msgid " &50%"
-msgstr " &50%"
-
-#: uml.cpp:349
-#, c-format
-msgid " &75%"
-msgstr " &75%"
-
-#: uml.cpp:350
-#, c-format
-msgid "&100%"
-msgstr "&100%"
-
-#: uml.cpp:351
-#, c-format
-msgid "1&50%"
-msgstr "1&50%"
-
-#: uml.cpp:352
-#, c-format
-msgid "&200%"
-msgstr "&200%"
-
-#: uml.cpp:353
-#, c-format
-msgid "3&00%"
-msgstr "3&00%"
-
-#: uml.cpp:394
-msgid "Diagram Toolbar"
-msgstr "Diagram Toolbar"
-
-#: uml.cpp:398
-msgid "Alignment Toolbar"
-msgstr "Alignment Toolbar"
-
-#: listpopupmenu.cpp:615 uml.cpp:420
-msgid "Class Diagram..."
-msgstr "Class Diagram..."
-
-#: listpopupmenu.cpp:618 uml.cpp:421
-msgid "Sequence Diagram..."
-msgstr "Sequence Diagram..."
-
-#: listpopupmenu.cpp:619 uml.cpp:422
-msgid "Collaboration Diagram..."
-msgstr "Collaboration Diagram..."
-
-#: listpopupmenu.cpp:551 uml.cpp:423
-msgid "Use Case Diagram..."
-msgstr "Use Case Diagram..."
-
-#: listpopupmenu.cpp:616 uml.cpp:424
-msgid "State Diagram..."
-msgstr "State Diagram..."
-
-#: listpopupmenu.cpp:617 uml.cpp:425
-msgid "Activity Diagram..."
-msgstr "Activity Diagram..."
-
-#: listpopupmenu.cpp:521 uml.cpp:426
-msgid "Component Diagram..."
-msgstr "Component Diagram..."
-
-#: listpopupmenu.cpp:528 uml.cpp:427
-msgid "Deployment Diagram..."
-msgstr "Deployment Diagram..."
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Template Name Not Unique"
 
-#: listpopupmenu.cpp:541 uml.cpp:428
-msgid "Entity Relationship Diagram..."
-msgstr "Entity Relationship Diagram..."
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Note Documentation"
 
-#: uml.cpp:458
-msgid "&Tree View"
-msgstr "&Tree View"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Initial activity"
 
-#: uml.cpp:467
-msgid "&Documentation"
-msgstr "&Documentation"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "End activity"
 
-#: uml.cpp:479 uml.cpp:664 uml.cpp:692
-msgid "Opening file..."
-msgstr "Opening file..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Activity type:"
 
-#: uml.cpp:650
-msgid "Creating new document..."
-msgstr "Creating new document..."
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Activity name:"
 
-#: uml.cpp:673
-msgid ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
-"*.xmi|Uncompressed XMI Files (*.xmi)\n"
-"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
-"*.mdl|Rose model files"
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
+#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
+#, no-c-format
+msgid "The format that the images will be exported to"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
-"*.xmi|Uncompressed XMI Files (*.xmi)\n"
-"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
-"*.mdl|Rose model files"
-
-#: uml.cpp:677
-msgid "Open File"
-msgstr "Open File"
 
-#: uml.cpp:716
-msgid "Saving file..."
-msgstr "Saving file..."
+#: objectwidget.cpp:90
+msgid "Rename Object"
+msgstr "Rename Object"
 
-#: uml.cpp:727
-msgid "Saving file with a new filename..."
-msgstr "Saving file with a new filename..."
+#: objectwidget.cpp:91
+msgid "Enter object name:"
+msgstr "Enter object name:"
 
-#: uml.cpp:732
+#: umlwidgetcontroller.cpp:128
 msgid ""
-"*.xmi|XMI File\n"
-"*.xmi.tgz|Gzip Compressed XMI File\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
-"*|All Files"
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel move."
 msgstr ""
-"*.xmi|XMI File\n"
-"*.xmi.tgz|Gzip Compressed XMI File\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
-"*|All Files"
 
-#: uml.cpp:740
+#: umlwidgetcontroller.cpp:379
 msgid ""
-"The file %1 exists.\n"
-"Do you wish to overwrite it?"
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel resize."
 msgstr ""
-"The file %1 exists.\n"
-"Do you wish to overwrite it?"
 
-#: uml.cpp:740
-msgid "Overwrite"
-msgstr "Overwrite"
-
-#: uml.cpp:764
-msgid "Closing file..."
-msgstr "Closing file..."
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Cannot Create Folder"
 
-#: uml.cpp:772
-msgid "Printing..."
-msgstr "Printing..."
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Can not save an empty diagram"
 
-#: uml.cpp:779
+#: umlviewimageexportermodel.cpp:151
 #, c-format
-msgid "Print %1"
-msgstr "Print %1"
-
-#: uml.cpp:787
-msgid "Exiting..."
-msgstr "Exiting..."
-
-#: uml.cpp:823
-msgid "Cutting selection..."
-msgstr "Cutting selection..."
-
-#: uml.cpp:836
-msgid "Copying selection to clipboard..."
-msgstr "Copying selection to clipboard..."
-
-#: uml.cpp:844
-msgid "Inserting clipboard contents..."
-msgstr "Inserting clipboard contents..."
-
-#: uml.cpp:849
-msgid ""
-"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
-"may be of the wrong type to be pasted here."
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
-"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
-"may be of the wrong type to be pasted here."
-
-#: clipboard/umlclipboard.cpp:691 uml.cpp:851
-msgid "Paste Error"
-msgstr "Paste Error"
-
-#: uml.cpp:863
-msgid "Toggling toolbar..."
-msgstr "Toggling toolbar..."
-
-#: uml.cpp:878
-msgid "Toggle the statusbar..."
-msgstr "Toggle the statusbar..."
-
-#: uml.cpp:1186
-msgid "Cannot view code until you generate some first."
-msgstr "Cannot view code until you generate some first."
-
-#: uml.cpp:1186 uml.cpp:1189
-msgid "Cannot View Code"
-msgstr "Cannot View Code"
-
-#: uml.cpp:1189
-msgid "Cannot view code from simple code writer."
-msgstr "Cannot view code from simple code writer."
-
-#: uml.cpp:1387
-msgid "*.idl|IDL Files (*.idl)"
-msgstr "*.idl|IDL Files (*.idl)"
-
-#: uml.cpp:1389
-msgid "*.py|Python Files (*.py)"
-msgstr "*.py|Python Files (*.py)"
-
-#: uml.cpp:1391
-msgid "*.java|Java Files (*.java)"
-msgstr "*.java|Java Files (*.java)"
-
-#: uml.cpp:1393
-#, fuzzy
-msgid "*.pas|Pascal Files (*.pas)"
-msgstr "*.java|Java Files (*.java)"
-
-#: uml.cpp:1395
-msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
-msgstr "*.ads *.ada|Ada Files (*.ads *.ada)"
-
-#: uml.cpp:1397
-msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
-msgstr "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
-
-#: uml.cpp:1399
-msgid "All Files"
-msgstr "All Files"
-
-#: uml.cpp:1401
-msgid "Select Code to Import"
-msgstr "Select Code to Import"
 
 #. i18n: file umbrelloui.rc line 5
 #: rc.cpp:6
@@ -3343,328 +3430,73 @@ msgstr "Role Changeability"
 msgid "Role Visibility"
 msgstr "Role Visibility"
 
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "The folderfile %1 does not exist."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "The folderfile %1 cannot be opened."
-
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Enter Activity Name"
-
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Enter State Name"
-
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Enter the name of the new state:"
-
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "new state"
-
-#: listpopupmenu.cpp:695 stereotype.cpp:76
-msgid "Stereotype"
-msgstr "Stereotype"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multiplicity"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Association Name"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Role Name"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagram: %2 Page %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Enter Diagram Name"
-
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Enter the new name of the diagram:"
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Delete Diagram?"
-
-#: objectwidget.cpp:90
-msgid "Rename Object"
-msgstr "Rename Object"
-
-#: objectwidget.cpp:91
-msgid "Enter object name:"
-msgstr "Enter object name:"
-
-#: clipboard/umlclipboard.cpp:687
-msgid ""
-"At least one of the items in the clipboard could not be pasted because an item "
-"of the same name already exists.  Any other items have been pasted."
-msgstr ""
-"At least one of the items in the clipboard could not be pasted because an item "
-"of the same name already exists.  Any other items have been pasted."
-
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Add Base Class"
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Add Derived Class"
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Add Operation"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Add Attribute"
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Add Base Interface"
-
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Add Derived Interface"
-
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Base Classifiers"
-
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Derived Classifiers"
-
-#: tips.cpp:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-
-#: tips.cpp:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-
-#: tips.cpp:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-
-#: tips.cpp:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-
-#: tips.cpp:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-
-#: tips.cpp:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalisation"
 
-#: tips.cpp:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Self Association"
 
-#: tips.cpp:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Collaboration Message"
 
-#: tips.cpp:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sequence Message"
 
-#: tips.cpp:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Collaboration Self Message"
 
-#: tips.cpp:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Sequence Self Message"
 
-#: tips.cpp:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>You can turn on autosaving in the Configure Umbrello dialogue.</p>\n"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realisation"
 
-#: tips.cpp:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Uni Association"
 
-#: tips.cpp:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Enter Activity"
 
-#: tips.cpp:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "General Options"
 
-#: tips.cpp:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Package is a namespace"
 
-#: tips.cpp:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtual destructors"
 
-#: tips.cpp:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Generate empty constructors"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Enter Activity"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Generate accessor methods"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Incorrect use of associations."
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operations are inline"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Association Error"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Accessors are inline"
 
-#: operation.cpp:185
-msgid "new_parameter"
-msgstr "new_parameter"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Accessors are public"
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -3731,11 +3563,13 @@ msgid "Change State Name..."
 msgstr "Change State Name..."
 
 #: listpopupmenu.cpp:376
-msgid "Flip Horizontal"
+#, fuzzy
+msgid "FlipQt::Horizontal"
 msgstr "Flip Horizontal"
 
 #: listpopupmenu.cpp:378
-msgid "Flip Vertical"
+#, fuzzy
+msgid "FlipQt::Vertical"
 msgstr "Flip Vertical"
 
 #: listpopupmenu.cpp:388
@@ -3960,6 +3794,177 @@ msgstr "Snap to Grid"
 msgid "Show Grid"
 msgstr "Show Grid"
 
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Rename cancelled"
+
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Renaming an item of listview type %1 is not yet implemented."
+
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Function Not Implemented"
+
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"The name you entered was invalid.\n"
+"Renaming process has been cancelled."
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Enter operation name:"
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Enter role name:"
+
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Enter multiplicity:"
+
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Enter association name:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Enter new text:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ERROR"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Change Text"
+
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multiplicity"
+
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Association Name"
+
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Role Name"
+
+#: main.cpp:32 main.cpp:93
+msgid "Umbrello UML Modeller"
+msgstr "Umbrello UML Modeller"
+
+#: main.cpp:40
+msgid "File to open"
+msgstr "File to open"
+
+#: main.cpp:41
+msgid "export diagrams to extension and exit"
+msgstr "export diagrams to extension and exit"
+
+#: main.cpp:42
+msgid "the local directory to save the exported diagrams in"
+msgstr ""
+
+#: main.cpp:42
+msgid "the directory of the file"
+msgstr ""
+
+#: main.cpp:43
+msgid ""
+"keep the tree structure used to store the views in the document in the target "
+"directory"
+msgstr ""
+
+#: main.cpp:95
+msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "new_actor"
+
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "new_usecase"
+
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "new_package"
+
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "new_component"
+
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "new_node"
+
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "new_artifact"
+
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "new_interface"
+
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "new_datatype"
+
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "new_enum"
+
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "new_entity"
+
+#: model_utils.cpp:264
+#, fuzzy
+msgid "new_folder"
+msgstr "new_node"
+
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "new_object"
+
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Empty"
+
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Malformed argument"
+
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Unknown argument type"
+
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Illegal method name"
+
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Unknown return type"
+
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Unspecified error"
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Incorrect use of associations."
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Association Error"
+
 #~ msgid "new_stereotype"
 #~ msgstr "new_stereotype"
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2014-09-29 03:08:03 -0500
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2014-09-29 03:08:03 -0500
commit	242434109c14a494dee7738b9c343f5947d20506 (patch)
tree	ea25930767128361a7669f1a25a479a66ccdfbeb /tde-i18n-en_GB/messages/tdesdk
parent	8819501c6a160b7ae106b1a968bc953b0f0bc465 (diff)
download	tde-i18n-242434109c14a494dee7738b9c343f5947d20506.tar.gz tde-i18n-242434109c14a494dee7738b9c343f5947d20506.zip