Automated l10n update (.po files)

author: Automated System <kb9vqf@pearsoncomputing.net> 2014-09-29 12:26:02 -0500
committer: Automated System <kb9vqf@pearsoncomputing.net> 2014-09-29 12:26:02 -0500
commit: ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c (patch)
tree: bf4fc5ad5f5d27517ae17ce5d396e492aafde6eb /tde-i18n-en_GB/messages/tdesdk
parent: dde6a6f118e2358c2aace236dd18d5bca405381c (diff)
download: tde-i18n-ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c.tar.gz
tde-i18n-ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c.zip
16 files changed, 7288 insertions, 7288 deletions
diff --git a/tde-i18n-en_GB/messages/tdesdk/cervisia.po b/tde-i18n-en_GB/messages/tdesdk/cervisia.po
index 44e8e95102f..ed2c4e6222b 100644
--- a/tde-i18n-en_GB/messages/tdesdk/cervisia.po
+++ b/tde-i18n-en_GB/messages/tdesdk/cervisia.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cervisia\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
diff --git a/tde-i18n-en_GB/messages/tdesdk/cvsservice.po b/tde-i18n-en_GB/messages/tdesdk/cvsservice.po
index 40c49d95af9..eedc4b7f837 100644
--- a/tde-i18n-en_GB/messages/tdesdk/cvsservice.po
+++ b/tde-i18n-en_GB/messages/tdesdk/cvsservice.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cvsservice\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
diff --git a/tde-i18n-en_GB/messages/tdesdk/kbabel.po b/tde-i18n-en_GB/messages/tdesdk/kbabel.po
index ab1712e35bd..9f9fb0f2aa0 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kbabel.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kbabel.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbabel\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
@@ -17,6 +17,289 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
+#: 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"
+
+#: 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"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:157
+#: catalogmanager/libsvn/svndialog.cpp:152 commonui/roughtransdlg.cpp:83
+msgid "C&ancel"
+msgstr "C&ancel"
+
+#: 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:"
+
+#: 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>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>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/tdeactionselector.cpp:81
+msgid "&Available:"
+msgstr "&Available:"
+
+#: commonui/tdeactionselector.cpp:96
+msgid "&Selected:"
+msgstr "&Selected:"
+
 #: commonui/context.cpp:97
 msgid "Corresponding source file not found"
 msgstr "Corresponding source file not found"
@@ -29,18 +312,6 @@ msgstr ""
 "KBabel cannot start a text editor component.\n"
 "Please check your TDE installation."
 
-#: commonui/cmdedit.cpp:51
-msgid "Command &Label:"
-msgstr "Command &Label:"
-
-#: commonui/cmdedit.cpp:52
-msgid "Co&mmand:"
-msgstr "Co&mmand:"
-
-#: commonui/cmdedit.cpp:66
-msgid "&Add"
-msgstr "&Add"
-
 #: commonui/finddialog.cpp:62
 msgid "&Find:"
 msgstr "&Find:"
@@ -114,7 +385,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:1219
+#: commonui/finddialog.cpp:124 rc.cpp:1237
 #, no-c-format
 msgid "C&ase sensitive"
 msgstr "C&ase sensitive"
@@ -140,7 +411,7 @@ msgid "F&ind backwards"
 msgstr "F&ind backwards"
 
 #. i18n: file ./catalogmanager/markpatternwidget.ui line 86
-#: commonui/finddialog.cpp:133 rc.cpp:1231
+#: commonui/finddialog.cpp:133 rc.cpp:1249
 #, no-c-format
 msgid "Use regu&lar expression"
 msgstr "Use regu&lar expression"
@@ -229,6 +500,26 @@ msgstr "R&eplace All"
 msgid "Replace this string?"
 msgstr "Replace this string?"
 
+#: 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/projectprefwidgets.cpp:138
 msgid "&Update header when saving"
 msgstr "&Update header when saving"
@@ -280,7 +571,7 @@ msgid "No autosave"
 msgstr "No autosave"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 29
-#: commonui/projectprefwidgets.cpp:188 rc.cpp:271
+#: commonui/projectprefwidgets.cpp:188 rc.cpp:360
 #, no-c-format
 msgid "&General"
 msgstr "&General"
@@ -760,13 +1051,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:199
+#: commonui/projectprefwidgets.cpp:890 rc.cpp:173
 #, 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:202
+#: commonui/projectprefwidgets.cpp:903 rc.cpp:176
 #, no-c-format
 msgid "Ba&se folder of POT files:"
 msgstr "Ba&se folder of POT files:"
@@ -1015,337 +1306,1844 @@ msgstr "&Base folder for source code:"
 msgid "Path Patterns"
 msgstr "Path Patterns"
 
-#: commonui/tdeactionselector.cpp:81
-msgid "&Available:"
-msgstr "&Available:"
+#: commonui/cmdedit.cpp:51
+msgid "Command &Label:"
+msgstr "Command &Label:"
 
-#: commonui/tdeactionselector.cpp:96
-msgid "&Selected:"
-msgstr "&Selected:"
+#: commonui/cmdedit.cpp:52
+msgid "Co&mmand:"
+msgstr "Co&mmand:"
 
-#: commonui/projectpref.cpp:70
-msgid ""
-"_: title of page in preferences dialog\n"
-"Identity"
-msgstr "Identity"
+#: commonui/cmdedit.cpp:66
+msgid "&Add"
+msgstr "&Add"
 
-#: commonui/projectpref.cpp:72
-msgid "Information About You and Translation Team"
-msgstr "Information About You and The Translation Team"
+#. i18n: file ./commonui/tdelisteditor.ui line 94
+#: rc.cpp:3 rc.cpp:578 rc.cpp:1264
+#, no-c-format
+msgid "New Item"
+msgstr "New Item"
 
-#: commonui/projectpref.cpp:76 kbabel/kbabelview.cpp:1595
-msgid ""
-"_: title of page in preferences dialog\n"
-"Save"
-msgstr "Save"
+#. i18n: file ./commonui/tdelisteditor.ui line 151
+#: rc.cpp:12
+#, no-c-format
+msgid "Up"
+msgstr "Up"
 
-#: commonui/projectpref.cpp:78 kbabel/kbabelview.cpp:1597
-msgid "Options for File Saving"
-msgstr "Options for File Saving"
+#. i18n: file ./commonui/tdelisteditor.ui line 162
+#: rc.cpp:15
+#, no-c-format
+msgid "Down"
+msgstr "Down"
 
-#: commonui/projectpref.cpp:82
+#. i18n: file ./commonui/projectwizardwidget.ui line 38
+#: rc.cpp:18
+#, no-c-format
 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"
+"<font size=\"+1\">Welcome to Project Wizard!</font>\n"
+"<br/>\n"
+"<p>\n"
+"The wizard will help you to setup a new translation\n"
+"project for KBabel.\n"
+"</p>\n"
+"<p>\n"
+"First of all, you need to choose the project name\n"
+"and the file, where the configuration should be stored.\n"
+"</p>\n"
+"<p>\n"
+"You should also choose a language to translate into\n"
+"and also a type of the translation project.\n"
+"</p>"
+msgstr ""
+"<font size=\"+1\">Welcome to Project Wizard!</font>\n"
+"<br/>\n"
+"<p>\n"
+"The wizard will help you to setup a new translation\n"
+"project for KBabel.\n"
+"</p>\n"
+"<p>\n"
+"First of all, you need to choose the project name\n"
+"and the file, where the configuration should be stored.\n"
+"</p>\n"
+"<p>\n"
+"You should also choose a language to translate into\n"
+"and also a type of the translation project.\n"
+"</p>"
 
-#: commonui/projectpref.cpp:89
+#. i18n: file ./commonui/projectwizardwidget.ui line 66
+#: rc.cpp:34 rc.cpp:111
+#, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"Source"
-msgstr "Source"
+"<qt>\n"
+"<p><b>Configuration File Name</b>"
+"<br/>\n"
+"The name of a file to store the configuration of the\n"
+"project.</p>\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<p><b>Configuration File Name</b>"
+"<br/>\n"
+"The name of a file to store the configuration of the\n"
+"project.</p>\n"
+"</qt>"
 
-#: commonui/projectpref.cpp:91
-msgid "Options for Showing Source Context"
-msgstr "Options for Showing Source Context"
+#. i18n: file ./commonui/projectwizardwidget.ui line 74
+#: rc.cpp:41
+#, no-c-format
+msgid "&Language:"
+msgstr "&Language:"
 
-#: commonui/projectpref.cpp:96
+#. i18n: file ./commonui/projectwizardwidget.ui line 86
+#: rc.cpp:44 rc.cpp:66
+#, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"Miscellaneous"
-msgstr "Miscellaneous"
+"<qt>\n"
+"<p>\n"
+"<b>Language</b>"
+"<br/>\n"
+"The destination language of the project, i.e., the language\n"
+"to translate into. It should follow the ISO 631 language naming\n"
+"standard.</p>\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<p>\n"
+"<b>Language</b>"
+"<br/>\n"
+"The destination language of the project, i.e., the language\n"
+"to translate into. It should follow the ISO 631 language naming\n"
+"standard.</p>\n"
+"</qt>"
 
-#: commonui/projectpref.cpp:98
-msgid "Miscellaneous Settings"
-msgstr "Miscellaneous Settings"
+#. i18n: file ./commonui/projectwizardwidget.ui line 97
+#: rc.cpp:53
+#, no-c-format
+msgid "Project &name:"
+msgstr "Project &name:"
 
-#: commonui/projectpref.cpp:101
+#. i18n: file ./commonui/projectwizardwidget.ui line 110
+#: rc.cpp:56 rc.cpp:98
+#, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"Folders"
-msgstr "Folders"
+"<qt>"
+"<p><b>Project name</b>"
+"<br/>\n"
+"The project name is an identification of a project for\n"
+"you. It is shown in the project configuration dialog\n"
+"as well as in the title of windows opened for the project.\n"
+"<br/>\n"
+"<br/>\n"
+"<b>Note:</b> The project name cannot be later changed.<\n"
+"</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Project name</b>"
+"<br/>\n"
+"The project name is an identification of a project for\n"
+"you. It is shown in the project configuration dialogue\n"
+"as well as in the title of windows opened for the project.\n"
+"<br/>\n"
+"<br/>\n"
+"<b>Note:</b> The project name cannot be later changed.<\n"
+"</p></qt>"
 
-#: commonui/projectpref.cpp:103
-msgid "Paths to Message Catalogs & Catalog Templates"
-msgstr "Paths to Message Catalogues & Catalogue Templates"
+#. i18n: file ./commonui/projectwizardwidget.ui line 135
+#: rc.cpp:75
+#, no-c-format
+msgid "Project &type:"
+msgstr "Project &type:"
 
-#: commonui/projectpref.cpp:106
+#. i18n: file ./commonui/projectwizardwidget.ui line 158
+#: rc.cpp:78 rc.cpp:130
+#, fuzzy, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"Folder Commands"
-msgstr "Folder Commands"
+"<qt>\n"
+"<p>\n"
+"<b>Project Type</b>\n"
+"The project type allows to tune the settings for the\n"
+"particular type of the well-known translation projects.\n"
+"For example, it sets up the validation tools,\n"
+"an accelerator marker and formatting of the header.\n"
+"</p>\n"
+"<p>Currently known types:\n"
+"<ul>\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"
+"done</li>\n"
+"</ul>\n"
+"</p>\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"<p>\n"
+"<b>Project Type</b>\n"
+"The project type allows to tune the settings for the\n"
+"particular type of the well-known translation projects.\n"
+"For example, it sets up the validation tools,\n"
+"an accelerator marker and formatting of the header.\n"
+"</p>\n"
+"<p>Currently known types:\n"
+"<ul>\n"
+"<li><b>TDE</b>: K Desktop Environment Internalisation 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"
+"done</li>\n"
+"</ul>\n"
+"</p>\n"
+"</qt>"
 
-#: commonui/projectpref.cpp:108
-msgid "User-Defined Commands for Folder Items"
-msgstr "User-Defined Commands for Folder Items"
+#. i18n: file ./commonui/projectwizardwidget.ui line 184
+#: rc.cpp:108
+#, no-c-format
+msgid "Configuration &file name:"
+msgstr "Configuration &file name:"
 
-#: commonui/projectpref.cpp:113
+#. i18n: file ./commonui/projectwizardwidget.ui line 200
+#: rc.cpp:118
+#, no-c-format
+msgid "TDE"
+msgstr "TDE"
+
+#. i18n: file ./commonui/projectwizardwidget.ui line 205
+#: rc.cpp:121
+#, no-c-format
+msgid "GNOME"
+msgstr "GNOME"
+
+#. i18n: file ./commonui/projectwizardwidget.ui line 210
+#: rc.cpp:124
+#, no-c-format
+msgid "Translation Project Robot"
+msgstr "Translation Project Robot"
+
+#. i18n: file ./commonui/projectwizardwidget.ui line 215
+#: rc.cpp:127
+#, no-c-format
+msgid "Other"
+msgstr "Other"
+
+#. i18n: file ./commonui/projectwizardwidget2.ui line 18
+#: rc.cpp:150
+#, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"File Commands"
-msgstr "File Commands"
+"<qt>"
+"<p><b>Translation Files</b></p>\n"
+"<p>Type in the folders which contain all your PO and POT files.\n"
+"The files and the folders in these folders will then be merged into one "
+"tree.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Translation Files</b></p>\n"
+"<p>Type in the folders which contain all your PO and POT files.\n"
+"The files and the folders in these folders will then be merged into one "
+"tree.</p></qt>"
 
-#: commonui/projectpref.cpp:115
-msgid "User-Defined Commands for File Items"
-msgstr "User-Defined Commands for File Items"
+#. i18n: file ./commonui/projectwizardwidget2.ui line 44
+#: rc.cpp:155
+#, no-c-format
+msgid ""
+"<font size=\"+1\">The Translation Files</font>\n"
+"<br/>"
+"<br/>\n"
+"If the project contains more than one file to translate, it\n"
+"better to organize the files. \n"
+"\n"
+"KBabel distinguishes two kind of the translation files:\n"
+"\n"
+"<ul>\n"
+"<li><b>Templates</b>: the files to be translated</li>\n"
+"<li><b>Translated files</b>: the files already translated (at least\n"
+"partially)</li>\n"
+"</ul>\n"
+"\n"
+"Choose the folders to store the files. If you\n"
+"leave the entries empty, the Catalog Manager\n"
+"will not work."
+msgstr ""
+"<font size=\"+1\">The Translation Files</font>\n"
+"<br/>"
+"<br/>\n"
+"If the project contains more than one file to translate, it\n"
+"better to organise the files. \n"
+"\n"
+"KBabel distinguishes two kind of the translation files:\n"
+"\n"
+"<ul>\n"
+"<li><b>Templates</b>: the files to be translated</li>\n"
+"<li><b>Translated files</b>: the files already translated (at least\n"
+"partially)</li>\n"
+"</ul>\n"
+"\n"
+"Choose the folders to store the files. If you\n"
+"leave the entries empty, the Catalogue Manager\n"
+"will not work."
 
-#: commonui/projectpref.cpp:120
+#. i18n: file ./commonui/diffpreferences.ui line 25
+#: rc.cpp:179
+#, no-c-format
+msgid "Diff Source"
+msgstr "Diff Source"
+
+#. i18n: file ./commonui/diffpreferences.ui line 41
+#: rc.cpp:182
+#, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"Catalog Manager"
-msgstr "Catalogue Manager"
+"<qt>"
+"<p><b>Source for difference lookup</b></p>\n"
+"<p>Here you can select a source, which should be used\n"
+"for finding a difference.</p>\n"
+"<p>You can select file, translation database or\n"
+"corresponding msgstr.</p>\n"
+"<p>If you choose the translation database, the messages to diff with are\n"
+"taken from the Translation Database; to be useful, you have\n"
+"to enable <i>Auto add entry to database</i> in its\n"
+"preferences dialog.</p>\n"
+"<p>The last option is useful for those using PO-files\n"
+"for proofreading.</p>\n"
+"<p>You can temporarily diff with messages from a file\n"
+"by choosing <i>Tools->Diff->Open file for diff</i>\n"
+"in KBabel's main window.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Source for difference lookup</b></p>\n"
+"<p>Here you can select a source, which should be used\n"
+"for finding a difference.</p>\n"
+"<p>You can select file, translation database or\n"
+"corresponding msgstr.</p>\n"
+"<p>If you choose the translation database, the messages to diff with are\n"
+"taken from the Translation Database; to be useful, you have\n"
+"to enable <i>Auto add entry to database</i> in its\n"
+"preferences dialog.</p>\n"
+"<p>The last option is useful for those using PO-files\n"
+"for proofreading.</p>\n"
+"<p>You can temporarily diff with messages from a file\n"
+"by choosing <i>Tools->Diff->Open file for diff</i>\n"
+"in KBabel's main window.</p></qt>"
 
-#: commonui/projectpref.cpp:122
-msgid "Catalog Manager View Settings"
-msgstr "Catalogue Manager View Settings"
+#. i18n: file ./commonui/diffpreferences.ui line 52
+#: rc.cpp:198
+#, no-c-format
+msgid "Use &file"
+msgstr "Use &file"
 
-#: commonui/projectpref.cpp:125 kbabel/kbabelpref.cpp:85
+#. i18n: file ./commonui/diffpreferences.ui line 60
+#: rc.cpp:201
+#, no-c-format
+msgid "Use messages from &translation database"
+msgstr "Use messages from &translation database"
+
+#. i18n: file ./commonui/diffpreferences.ui line 68
+#: rc.cpp:204
+#, 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:207
+#, no-c-format
+msgid "Base folder for diff files:"
+msgstr "Base folder for diff files:"
+
+#. i18n: file ./commonui/diffpreferences.ui line 104
+#: rc.cpp:210
+#, no-c-format
 msgid ""
-"_: title of page in preferences dialog\n"
-"Diff"
-msgstr "Diff"
+"<qt><q><b>Base folder for diff files</b></q>\n"
+"<p>Here you can define a folder in which the files to\n"
+"diff with are stored. If the files are stored at the same\n"
+"place beneath this folder as the original files beneath\n"
+"their base folder, KBabel can automatically open the correct\n"
+"file to diff with.</p>\n"
+"<p>Note that this option has no effect if messages from\n"
+"the database are used for diffing.</p></qt>"
+msgstr ""
+"<qt><q><b>Base folder for diff files</b></q>\n"
+"<p>Here you can define a folder in which the files to\n"
+"diff with are stored. If the files are stored at the same\n"
+"place beneath this folder as the original files beneath\n"
+"their base folder, KBabel can automatically open the correct\n"
+"file to diff with.</p>\n"
+"<p>Note that this option has no effect if messages from\n"
+"the database are used for diffing.</p></qt>"
 
-#: commonui/projectpref.cpp:127
-msgid "Searching for Differences"
-msgstr "Searching for Differences"
+#. i18n: file ./kbabel/editordiffpreferences.ui line 36
+#: rc.cpp:223
+#, no-c-format
+msgid "Added Characters"
+msgstr "Added Characters"
 
-#: commonui/roughtransdlg.cpp:69
+#. i18n: file ./kbabel/editordiffpreferences.ui line 44
+#: rc.cpp:226
+#, no-c-format
+msgid "Ho&w to display:"
+msgstr "Ho&w to display:"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 55
+#: rc.cpp:229
+#, no-c-format
+msgid "Co&lor:"
+msgstr "Co&lour:"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 66
+#: rc.cpp:232
+#, no-c-format
+msgid "Removed Characters"
+msgstr "Removed Characters"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 74
+#: rc.cpp:235
+#, no-c-format
+msgid "How &to display:"
+msgstr "How &to display:"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 85
+#: rc.cpp:238 rc.cpp:431
+#, no-c-format
+msgid "Colo&r:"
+msgstr "Colou&r:"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 94
+#: rc.cpp:241 rc.cpp:247
+#, no-c-format
+msgid "Highlighted"
+msgstr "Highlighted"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 99
+#: rc.cpp:244
+#, no-c-format
+msgid "Underlined"
+msgstr "Underlined"
+
+#. i18n: file ./kbabel/editordiffpreferences.ui line 129
+#: rc.cpp:250
+#, no-c-format
+msgid "Stroked Out"
+msgstr "Stroked Out"
+
+#. i18n: file ./kbabel/colorpreferences.ui line 41
+#: rc.cpp:253
+#, no-c-format
+msgid "&Background color:"
+msgstr "&Background colour:"
+
+#. i18n: file ./kbabel/colorpreferences.ui line 52
+#: rc.cpp:256
+#, no-c-format
+msgid "Color for &quoted characters:"
+msgstr "Colour for &quoted characters:"
+
+#. i18n: file ./kbabel/colorpreferences.ui line 63
+#: rc.cpp:259
+#, no-c-format
+msgid "Color for &syntax errors:"
+msgstr "Colour for &syntax errors:"
+
+#. i18n: file ./kbabel/colorpreferences.ui line 82
+#: rc.cpp:262
+#, no-c-format
+msgid "Color for s&pellcheck errors:"
+msgstr "Colour for s&pellcheck errors:"
+
+#. i18n: file ./kbabel/colorpreferences.ui line 97
+#: rc.cpp:265
+#, no-c-format
 msgid ""
-"_: Caption of dialog\n"
-"Rough Translation"
-msgstr "Rough Translation"
+"<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>"
 
-#: commonui/roughtransdlg.cpp:82 kbabeldict/kbabeldictview.cpp:111
-msgid "S&top"
-msgstr "S&top"
+#. i18n: file ./kbabel/colorpreferences.ui line 105
+#: rc.cpp:269
+#, no-c-format
+msgid "Color for &keyboard accelerators:"
+msgstr "Colour for &keyboard accelerators:"
 
-#: catalogmanager/libcvs/cvsdialog.cpp:157
-#: catalogmanager/libsvn/svndialog.cpp:152 commonui/roughtransdlg.cpp:83
-msgid "C&ancel"
-msgstr "C&ancel"
+#. i18n: file ./kbabel/colorpreferences.ui line 132
+#: rc.cpp:272
+#, no-c-format
+msgid "Color for c-for&mat characters:"
+msgstr "Colour for c-for&mat characters:"
 
-#: commonui/roughtransdlg.cpp:96
-msgid "What to Translate"
-msgstr "What to Translate"
+#. i18n: file ./kbabel/colorpreferences.ui line 151
+#: rc.cpp:275
+#, no-c-format
+msgid "Color for &tags:"
+msgstr "Colour for &tags:"
 
-#: commonui/roughtransdlg.cpp:102
-msgid "U&ntranslated entries"
-msgstr "U&ntranslated entries"
+#. i18n: file ./kbabel/fontpreferences.ui line 25
+#: rc.cpp:278
+#, no-c-format
+msgid "Font for Messages"
+msgstr "Font for Messages"
 
-#: commonui/roughtransdlg.cpp:103
-msgid "&Fuzzy entries"
-msgstr "&Fuzzy entries"
+#. i18n: file ./kbabel/fontpreferences.ui line 36
+#: rc.cpp:281
+#, no-c-format
+msgid "&Show only fixed font"
+msgstr "&Show only fixed font"
 
-#: commonui/roughtransdlg.cpp:104
-msgid "T&ranslated entries"
-msgstr "T&ranslated entries"
+#. i18n: file ./kbabel/searchpreferences.ui line 39
+#: rc.cpp:284
+#, no-c-format
+msgid "Au&tomatically start search"
+msgstr "Au&tomatically start search"
 
-#: commonui/roughtransdlg.cpp:108
+#. i18n: file ./kbabel/searchpreferences.ui line 49
+#: rc.cpp:287
+#, no-c-format
 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>"
+"<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>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>"
+"<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>"
 
-#: commonui/roughtransdlg.cpp:113
-msgid "How to Translate"
-msgstr "How to Translate"
+#. i18n: file ./kbabel/searchpreferences.ui line 65
+#: rc.cpp:297
+#, no-c-format
+msgid "D&efault dictionary:"
+msgstr "D&efault dictionary:"
 
-#: commonui/roughtransdlg.cpp:118
-msgid "&Use dictionary settings"
-msgstr "&Use dictionary settings"
+#. i18n: file ./kbabel/searchpreferences.ui line 82
+#: rc.cpp:300
+#, 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>"
 
-#: commonui/roughtransdlg.cpp:121
-msgid "Fu&zzy translation (slow)"
-msgstr "Fu&zzy translation (slow)"
+#. i18n: file ./kbabel/spelldlgwidget.ui line 24
+#: rc.cpp:309
+#, no-c-format
+msgid "Choose What You Want to Spell Check"
+msgstr "Choose What You Want to Spell Check"
 
-#: commonui/roughtransdlg.cpp:123
-msgid "&Single word translation"
-msgstr "&Single word translation"
+#. i18n: file ./kbabel/spelldlgwidget.ui line 30
+#: rc.cpp:312 rc.cpp:324
+#, no-c-format
+msgid "Spell check only the current message."
+msgstr "Spell check only the current message."
 
-#: commonui/roughtransdlg.cpp:126
+#. i18n: file ./kbabel/spelldlgwidget.ui line 41
+#: rc.cpp:315
+#, no-c-format
+msgid "A&ll messages"
+msgstr "A&ll messages"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 44
+#: rc.cpp:318
+#, no-c-format
+msgid "Spell check all translated messages of this file."
+msgstr "Spell check all translated messages of this file."
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 52
+#: rc.cpp:321
+#, no-c-format
+msgid "C&urrent message only"
+msgstr "C&urrent message only"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 66
+#: rc.cpp:327
+#, 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"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 74
+#: rc.cpp:330
+#, no-c-format
+msgid "&From beginning of file to cursor position"
+msgstr "&From beginning of file to cursor position"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 77
+#: rc.cpp:333
+#, 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."
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 85
+#: rc.cpp:336
+#, no-c-format
+msgid "F&rom cursor position to end of file"
+msgstr "F&rom cursor position to end of file"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 88
+#: rc.cpp:339
+#, no-c-format
+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/spelldlgwidget.ui line 96
+#: rc.cpp:342
+#, no-c-format
+msgid "S&elected text only"
+msgstr "S&elected text only"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 99
+#: rc.cpp:345
+#, no-c-format
+msgid "Spell check only the selected text."
+msgstr "Spell check only the selected text."
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 109
+#: rc.cpp:348
+#, no-c-format
+msgid "U&se this selection as default"
+msgstr "U&se this selection as default"
+
+#. i18n: file ./kbabel/spelldlgwidget.ui line 112
+#: rc.cpp:351
+#, 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."
+
+#. i18n: file ./kbabel/headerwidget.ui line 24
+#: kbabel/commentview.cpp:78 rc.cpp:354
+#, no-c-format
+msgid "&Comment:"
+msgstr "&Comment:"
+
+#. i18n: file ./kbabel/headerwidget.ui line 43
+#: rc.cpp:357
+#, no-c-format
+msgid "&Header:"
+msgstr "&Header:"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 54
+#: rc.cpp:363
+#, no-c-format
+msgid "A&utomatically unset fuzzy status"
+msgstr "A&utomatically unset fuzzy status"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 60
+#: rc.cpp:366
+#, no-c-format
 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>"
+"<p><b>Automatically unset fuzzy status</b></p>\n"
+"<p>If this is activated and you are editing a fuzzy entry, the fuzzy status is "
+"automatically\n"
+"unset (this means the string <i>, fuzzy</i>\n"
+"is removed from the entry's comment).</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>"
+"<p><b>Automatically unset fuzzy status</b></p>\n"
+"<p>If this is activated and you are editing a fuzzy entry, the fuzzy status is "
+"automatically\n"
+"unset (this means the string <i>, fuzzy</i>\n"
+"is removed from the entry's comment).</p></qt>"
 
-#: commonui/roughtransdlg.cpp:136
-msgid "&Mark changed entries as fuzzy"
-msgstr "&Mark changed entries as fuzzy"
+#. i18n: file ./kbabel/editorpreferences.ui line 68
+#: rc.cpp:372
+#, no-c-format
+msgid "Use cle&ver editing"
+msgstr "Use cle&ver editing"
 
-#: commonui/roughtransdlg.cpp:139
+#. i18n: file ./kbabel/editorpreferences.ui line 79
+#: rc.cpp:375
+#, no-c-format
 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>"
+"<p><b>Use clever editing</b></p>\n"
+"<p>Check this to make typing text more comfortable and let \n"
+"KBabel take care of some special characters that have to \n"
+"be quoted. For example typing '\\\"' will result in \n"
+"'\\\\\\\"', pressing Return will automatically add whitespace \n"
+"at the end of the line, pressing Shift+Return will add \n"
+"'\\\\n' at the end of the line.</p>\n"
+"<p>Note that this is just a hint: it is still possible to \n"
+"generate syntactically incorrect text.</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>"
+"<p><b>Use clever editing</b></p>\n"
+"<p>Check this to make typing text more comfortable and let \n"
+"KBabel take care of some special characters that have to \n"
+"be quoted. For example typing '\\\"' will result in \n"
+"'\\\\\\\"', pressing Return will automatically add whitespace \n"
+"at the end of the line, pressing Shift+Return will add \n"
+"'\\\\n' at the end of the line.</p>\n"
+"<p>Note that this is just a hint: it is still possible to \n"
+"generate syntactically incorrect text.</p></qt>"
 
-#: commonui/roughtransdlg.cpp:150
-msgid "Initialize &TDE-specific entries"
-msgstr "Initialise &TDE-specific entries"
+#. i18n: file ./kbabel/editorpreferences.ui line 89
+#: rc.cpp:386
+#, no-c-format
+msgid "Automatic Checks"
+msgstr "Automatic Checks"
 
-#: commonui/roughtransdlg.cpp:153
+#. i18n: file ./kbabel/editorpreferences.ui line 97
+#: rc.cpp:389
+#, no-c-format
 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>"
+"<p><b>Error recognition</b></p>\n"
+"<p>Here you can set how to show that an error occurred. \n"
+"<b>Beep on error</b> beeps and <b>Change text color on error\n"
+"</b> changes the color of the translated text. If none is \n"
+"activated, you will still see a message in the statusbar.\n"
+"</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>"
+"<p><b>Error recognition</b></p>\n"
+"<p>Here you can set how to show that an error occurred. \n"
+"<b>Beep on error</b> beeps and <b>Change text colour on error\n"
+"</b> changes the colour of the translated text. If none is \n"
+"activated, you will still see a message in the statusbar.\n"
+"</p></qt>"
 
-#: commonui/roughtransdlg.cpp:158
-msgid "Dictionaries"
-msgstr "Dictionaries"
+#. i18n: file ./kbabel/editorpreferences.ui line 113
+#: rc.cpp:397
+#, no-c-format
+msgid "&Beep on error"
+msgstr "&Beep on error"
 
-#: commonui/roughtransdlg.cpp:177
+#. i18n: file ./kbabel/editorpreferences.ui line 121
+#: rc.cpp:400
+#, 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:403
+#, no-c-format
+msgid "A&ppearance"
+msgstr "A&ppearance"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 175
+#: rc.cpp:406
+#, no-c-format
+msgid "H&ighlight syntax"
+msgstr "H&ighlight syntax"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 183
+#: rc.cpp:409
+#, no-c-format
+msgid "Highlight backgrou&nd"
+msgstr "Highlight backgrou&nd"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 191
+#: rc.cpp:412
+#, no-c-format
+msgid "Mark &whitespaces with points"
+msgstr "Mark &white spaces with points"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 199
+#: rc.cpp:415
+#, no-c-format
+msgid "&Show surrounding quotes"
+msgstr "&Show surrounding quotes"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 209
+#: rc.cpp:418
+#, no-c-format
+msgid "Status LEDs"
+msgstr "Status LEDs"
+
+#. i18n: file ./kbabel/editorpreferences.ui line 213
+#: rc.cpp:421
+#, no-c-format
 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>"
+"<p><b>Status LEDs</b></p>\n"
+"<p>Choose here where the status LEDs are displayed and what color they have.</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>"
+"<p><b>Status LEDs</b></p>\n"
+"<p>Choose here where the status LEDs are displayed and what colour they "
+"have.</p></qt>"
 
-#: commonui/roughtransdlg.cpp:186
-msgid "Messages:"
-msgstr "Messages:"
+#. i18n: file ./kbabel/editorpreferences.ui line 224
+#: rc.cpp:425
+#, no-c-format
+msgid "Display in stat&usbar"
+msgstr "Display in stat&us bar"
 
-#: catalogmanager/multiroughtransdlg.cpp:129 commonui/roughtransdlg.cpp:671
+#. i18n: file ./kbabel/editorpreferences.ui line 232
+#: rc.cpp:428
+#, no-c-format
+msgid "Display in edi&tor"
+msgstr "Display in edi&tor"
+
+#. i18n: file ./kbabel/kbabelui.rc line 29
+#: rc.cpp:440 rc.cpp:1189
+#, no-c-format
+msgid "&Go"
+msgstr "&Go"
+
+#. i18n: file ./kbabel/kbabelui.rc line 50
+#: rc.cpp:443 rc.cpp:1195
+#, no-c-format
+msgid "&Project"
+msgstr "&Project"
+
+#. i18n: file ./kbabel/kbabelui.rc line 58
+#: rc.cpp:449
+#, no-c-format
+msgid "&Spelling"
+msgstr "&Spelling"
+
+#. i18n: file ./kbabel/kbabelui.rc line 68
+#: rc.cpp:452
+#, no-c-format
+msgid "D&iff"
+msgstr "D&iff"
+
+#. i18n: file ./kbabel/kbabelui.rc line 82
+#: rc.cpp:455
+#, no-c-format
+msgid "&Dictionaries"
+msgstr "&Dictionaries"
+
+#. i18n: file ./kbabel/kbabelui.rc line 100
+#: rc.cpp:467 rc.cpp:1213
+#, no-c-format
+msgid "Main"
+msgstr "Main"
+
+#. i18n: file ./kbabel/kbabelui.rc line 113
+#: rc.cpp:470 rc.cpp:1216
+#, no-c-format
+msgid "Navigationbar"
+msgstr "Navigation bar"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 28
+#: rc.cpp:473
+#, no-c-format
+msgid "General"
+msgstr "General"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 39
+#: rc.cpp:476 rc.cpp:746 rc.cpp:1077
+#, no-c-format
+msgid "Database"
+msgstr "Database"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 50
+#: rc.cpp:479
+#, no-c-format
+msgid "DB folder:"
+msgstr "DB folder:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 63
+#: rc.cpp:482
+#, no-c-format
+msgid "Automatic update in kbabel"
+msgstr "Automatic update in kbabel"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 73
+#: rc.cpp:485
+#, no-c-format
+msgid "New Entries"
+msgstr "New Entries"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 84
+#: kbabeldict/kbabeldictbox.cpp:1268 rc.cpp:488
+#, no-c-format
+msgid "Author:"
+msgstr "Author:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 92
+#: rc.cpp:491
+#, no-c-format
+msgid "From kbabel"
+msgstr "From kbabel"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 126
+#: rc.cpp:494
+#, no-c-format
+msgid "Algorithm"
+msgstr "Algorithm"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 137
+#: rc.cpp:497
+#, no-c-format
+msgid "Minimum score:"
+msgstr "Minimum score:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 176
+#: rc.cpp:500
+#, no-c-format
+msgid "Algorithms to Use"
+msgstr "Algorithms to Use"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 187
+#: rc.cpp:503 rc.cpp:506 rc.cpp:524 rc.cpp:527 rc.cpp:530 rc.cpp:533
+#: rc.cpp:536
+#, no-c-format
+msgid "Score:"
+msgstr "Score:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 213
+#: rc.cpp:509
+#, no-c-format
+msgid "Fuzzy sentence archive"
+msgstr "Fuzzy sentence archive"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 221
+#: rc.cpp:512
+#, no-c-format
+msgid "Glossary"
+msgstr "Glossary"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 229
+#: rc.cpp:515
+#, no-c-format
+msgid "Exact "
+msgstr "Exact "
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 252
+#: rc.cpp:518
+#, no-c-format
+msgid "Sentence by sentence"
+msgstr "Sentence by sentence"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 260
+#: rc.cpp:521
+#, no-c-format
+msgid "Alphanumeric"
+msgstr "Alphanumeric"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 313
+#: rc.cpp:539
+#, no-c-format
+msgid "Word by word"
+msgstr "Word by word"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 321
+#: rc.cpp:542
+#, no-c-format
+msgid "Dynamic dictionary"
+msgstr "Dynamic dictionary"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 336
+#: rc.cpp:545
+#, no-c-format
+msgid "Preferred number of results:"
+msgstr "Preferred number of results:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 356
+#: rc.cpp:548
+#, no-c-format
+msgid "Output"
+msgstr "Output"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 367
+#: rc.cpp:551
+#, no-c-format
+msgid "Output Processing"
+msgstr "Output Processing"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 395
+#: rc.cpp:554
+#, no-c-format
+msgid "First capital letter match"
+msgstr "First capital letter match"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 403
+#: rc.cpp:557
+#, no-c-format
+msgid "All capital letter match"
+msgstr "All capital letter match"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 411
+#: rc.cpp:560
+#, no-c-format
+msgid "Accelerator symbol (&&)"
+msgstr "Accelerator symbol (&&)"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 419
+#: rc.cpp:563
+#, 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:566
+#, no-c-format
+msgid "Custom Rules"
+msgstr "Custom Rules"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 440
+#: rc.cpp:569
+#, no-c-format
+msgid "Original string regexp:"
+msgstr "Original string regexp:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 451
+#: rc.cpp:572
+#, no-c-format
+msgid "Enabled"
+msgstr "Enabled"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 462
+#: rc.cpp:575
+#, no-c-format
+msgid "Description"
+msgstr "Description"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 527
+#: rc.cpp:587
+#, no-c-format
+msgid "Replace string:"
+msgstr "Replace string:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 545
+#: rc.cpp:590
+#, no-c-format
+msgid "Translated regexp(search):"
+msgstr "Translated regexp(search):"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 583
+#: rc.cpp:599
+#, no-c-format
+msgid "Check language"
+msgstr "Check language"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 599
+#: rc.cpp:602
+#, no-c-format
+msgid "Use current filters"
+msgstr "Use current filters"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 615
+#: rc.cpp:605
+#, no-c-format
+msgid "Set date to today"
+msgstr "Set date to today"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 624
+#: rc.cpp:608
+#, no-c-format
+msgid "Sources"
+msgstr "Sources"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 651
+#: rc.cpp:617
+#, no-c-format
+msgid "Scan Now"
+msgstr "Scan Now"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 684
+#: rc.cpp:623
+#, no-c-format
+msgid "Scan All"
+msgstr "Scan All"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 701
+#: rc.cpp:626
+#, no-c-format
+msgid "Filters"
+msgstr "Filters"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 17
+#: rc.cpp:629
+#, no-c-format
+msgid "DBSEPrefWidget"
+msgstr "DBSEPrefWidget"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 41
+#: rc.cpp:632 rc.cpp:800 rc.cpp:963 rc.cpp:1131
+#, no-c-format
+msgid "Generic"
+msgstr "Generic"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 58
+#: rc.cpp:635 rc.cpp:966
+#, no-c-format
+msgid "Search Mode"
+msgstr "Search Mode"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 75
+#: rc.cpp:638 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:641 rc.cpp:972
+#, no-c-format
 msgid ""
-"Result of the translation:\n"
-"Edited entries: %1\n"
-"Exact translations: %2 (%3%)\n"
-"Approximate translations: %4 (%5%)\n"
-"Nothing found: %6 (%7%)"
+"<qml>Scroll the whole database and return everything that matches \n"
+"according to the rules defined in tabs <strong> Generic </strong>\n"
+"and <strong>Match</strong>"
 msgstr ""
-"Result of the translation:\n"
-"Edited entries: %1\n"
-"Exact translations: %2 (%3%)\n"
-"Approximate translations: %4 (%5%)\n"
-"Nothing found: %6 (%7%)"
+"<qml>Scroll the whole database and return everything that matches \n"
+"according to the rules defined in tabs <strong> Generic </strong>\n"
+"and <strong>Match</strong>"
 
-#: catalogmanager/multiroughtransdlg.cpp:143 commonui/roughtransdlg.cpp:685
-msgid "Rough Translation Statistics"
-msgstr "Rough Translation Statistics"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 88
+#: rc.cpp:646 rc.cpp:977
+#, no-c-format
+msgid "Search in list of \"good keys\" (best)"
+msgstr "Search in list of \"good keys\" (best)"
 
-#: commonui/roughtransdlg.cpp:744
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 95
+#: rc.cpp:649 rc.cpp:980
+#, no-c-format
+msgid ""
+"<qml>Search in a list of <em>good keys</em> (see <strong>Good keys</strong> "
+"tab) with rules defined in <strong>Search</strong> tab.\n"
+"This is the best way to search because the <em>good keys</em> "
+"list probably contains all the keys that match with your query. However, it is "
+"smaller than the whole database."
+msgstr ""
+"<qml>Search in a list of <em>good keys</em> (see <strong>Good keys</strong> "
+"tab) with rules defined in <strong>Search</strong> tab.\n"
+"This is the best way to search because the <em>good keys</em> "
+"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:653 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:656 rc.cpp:987
+#, no-c-format
+msgid ""
+"<qml>Returns the whole <em>good keys</em> list. Rules defined in <strong>"
+"Search</strong> tab are ignored."
+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:659 rc.cpp:990
+#, no-c-format
+msgid "Case sensitive"
+msgstr "Case sensitive"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 119
+#: rc.cpp:662 rc.cpp:993
+#, no-c-format
+msgid ""
+"<qml>If it is checked the search will be case sensitive. It is ignored if you "
+"use <em>Return the list of \"good keys\"</em> search mode."
+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:665 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:668 rc.cpp:999
+#, no-c-format
+msgid ""
+"Remove white spaces at the beginning and at the end of the phrase.\n"
+"It also substitutes groups of more than one space character with only one space "
+"character."
+msgstr ""
+"Remove white spaces at the beginning and at the end of the phrase.\n"
+"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:672 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:675 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:678 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:681 rc.cpp:1012
+#, no-c-format
+msgid "Search"
+msgstr "Search"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 229
+#: rc.cpp:684 rc.cpp:1015
+#, no-c-format
+msgid "Matching Method"
+msgstr "Matching Method"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 280
+#: rc.cpp:687 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:690 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:693 rc.cpp:1024
+#, no-c-format
+msgid "Query contains"
+msgstr "Query contains"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 294
+#: rc.cpp:696 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:699 rc.cpp:1030
+#, no-c-format
+msgid "Normal text"
+msgstr "Normal text"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 308
+#: rc.cpp:702 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:705 rc.cpp:1036
+#, no-c-format
+msgid "Equal"
+msgstr "Equal"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 325
+#: rc.cpp:708 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:711 rc.cpp:1042
+#, no-c-format
+msgid "Regular expression"
+msgstr "Regular expression"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 353
+#: rc.cpp:714 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:717 rc.cpp:1048
+#, no-c-format
+msgid "Word Substitution"
+msgstr "Word Substitution"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 368
+#: rc.cpp:720 rc.cpp:1051
+#, no-c-format
+msgid ""
+"<qml>If you use one or two <em>word substitution</em> "
+"each time you search a phrase with less than the specified number of words, the "
+"search engine will also search for all phrases that differ from the original "
+"one in one or two words."
+"<p>\n"
+"<strong>Example:</strong>"
+"<br>\n"
+"If you search for <em>My name is Andrea</em> and you have activated <em>"
+"one word substitution</em> you may also find phrases like <em>"
+"My name is Joe</em> or <em>Your name is Andrea</em>."
+msgstr ""
+"<qml>If you use one or two <em>word substitution</em> "
+"each time you search a phrase with less than the specified number of words, the "
+"search engine will also search for all phrases that differ from the original "
+"one in one or two words."
+"<p>\n"
+"<strong>Example:</strong>"
+"<br>\n"
+"If you search for <em>My name is Andrea</em> and you have activated <em>"
+"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:725 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:728 rc.cpp:734 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:731 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:737 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:740 rc.cpp:1071
+#, no-c-format
+msgid "]"
+msgstr "]"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 519
+#: rc.cpp:743 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:749 rc.cpp:1080
+#, no-c-format
+msgid "Database folder:"
+msgstr "Database folder:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 589
+#: rc.cpp:752 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:755 rc.cpp:1086
+#, no-c-format
+msgid ""
+"Automatically add an entry to the database if a new translation is notified by "
+"someone (may be kbabel)"
+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:758 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:761 rc.cpp:1092
+#, no-c-format
+msgid ""
+"<qml>Put here the name and email address that you want to use as <em>"
+"last translator</em> filed when you auto-add entry to the database (e.g. when "
+"you modify a translation with kbabel)."
+"<p>"
+msgstr ""
+"<qml>Put here the name and email address that you want to use as <em>"
+"last translator</em> filed when you auto-add entry to the database (e.g. when "
+"you modify a translation with KBabel)."
+"<p>"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 635
+#: rc.cpp:764
+#, no-c-format
+msgid "Scan Single PO File"
+msgstr "Scan Single PO File"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 643
+#: rc.cpp:767
+#, no-c-format
+msgid "Scan Folder"
+msgstr "Scan Folder"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 651
+#: rc.cpp:770
+#, no-c-format
+msgid "Scan Folder && Subfolders"
+msgstr "Scan Folder && Subfolders"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 673
+#: rc.cpp:773 rc.cpp:1104
+#, no-c-format
+msgid "Scanning file:"
+msgstr "Scanning file:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 681
+#: rc.cpp:776 rc.cpp:1107
+#, no-c-format
+msgid "Entries added:"
+msgstr "Entries added:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 722
+#: rc.cpp:779 rc.cpp:1110
+#, no-c-format
+msgid "Total progress:"
+msgstr "Total progress:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 730
+#: rc.cpp:782 rc.cpp:1113
+#, no-c-format
+msgid "Processing file:"
+msgstr "Processing file:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 766
+#: rc.cpp:785 rc.cpp:1116
+#, no-c-format
+msgid "Loading file:"
+msgstr "Loading file:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 779
+#: rc.cpp:788 rc.cpp:1119
+#, no-c-format
+msgid "Export..."
+msgstr "Export..."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 790
+#: catalogmanager/catalogmanagerview.cpp:795 rc.cpp:791 rc.cpp:1122
+#, no-c-format
+msgid "Statistics"
+msgstr "Statistics"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 798
+#: rc.cpp:794 rc.cpp:1125
+#, no-c-format
+msgid "Repeated Strings"
+msgstr "Repeated Strings"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 808
+#: rc.cpp:797 rc.cpp:1128
+#, no-c-format
+msgid "Good Keys"
+msgstr "Good Keys"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 832
+#: rc.cpp:803 rc.cpp:1134
+#, no-c-format
+msgid ""
+"<qml>Here you can define how to fill the <em>good keys list</em>."
+"<p>\n"
+"You can set the minimum number of words of the query that a key must have to be "
+"inserted in the <em>good keys list</em>."
+"<p>\n"
+"You can also set the minimum number of words of the key that the query must "
+"have to insert the key in the list."
+"<p>\n"
+"These two numbers are the percentage of the total number of words. If the "
+"result of this percentage is less than one, the engine will set it to one."
+"<p>\n"
+"Finally you can set the maximum number of entries in the list."
+msgstr ""
+"<qml>Here you can define how to fill the <em>good keys list</em>."
+"<p>\n"
+"You can set the minimum number of words of the query that a key must have to be "
+"inserted in the <em>good keys list</em>."
+"<p>\n"
+"You can also set the minimum number of words of the key that the query must "
+"have to insert the key in the list."
+"<p>\n"
+"These two numbers are the percentage of the total number of words. If the "
+"result of this percentage is less than one, the engine will set it to one."
+"<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:810 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:813 rc.cpp:819 rc.cpp:1144 rc.cpp:1150
+#, no-c-format
+msgid "%"
+msgstr "%"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 888
+#: rc.cpp:816 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:822 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:825 rc.cpp:1156
+#, no-c-format
+msgid "Frequent Words"
+msgstr "Frequent Words"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 962
+#: rc.cpp:828 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:831 rc.cpp:1162
+#, no-c-format
+msgid "/10000"
+msgstr "/10000"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 987
+#: rc.cpp:834 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/dbsearchengine2/sourcedialog.ui line 16
+#: rc.cpp:837
+#, no-c-format
+msgid "Edit Source"
+msgstr "Edit Source"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 60
+#: rc.cpp:846
+#, no-c-format
+msgid "Additional Informations"
+msgstr "Additional Informations"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 75
+#: kbabel/kbabel.cpp:713 rc.cpp:849
+#, no-c-format
+msgid "Status: "
+msgstr "Status: "
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 133
+#: rc.cpp:852
+#, no-c-format
+msgid "Project name:"
+msgstr "Project name:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 149
+#: rc.cpp:855
+#, no-c-format
+msgid "Project keywords:"
+msgstr "Project keywords:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 158
+#: rc.cpp:858
+#, no-c-format
+msgid "General Info"
+msgstr "General Info"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 172
+#: rc.cpp:861
+#, no-c-format
+msgid "Single File"
+msgstr "Single File"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 177
+#: rc.cpp:864
+#, no-c-format
+msgid "Single Folder"
+msgstr "Single Folder"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 182
+#: rc.cpp:867
+#, no-c-format
+msgid "Recursive Folder"
+msgstr "Recursive Folder"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 194
+#: rc.cpp:870
+#, no-c-format
+msgid "Source name:"
+msgstr "Source name:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 207
+#: rc.cpp:873
+#, no-c-format
+msgid "Type:"
+msgstr "Type:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 215
+#: rc.cpp:876
+#, no-c-format
+msgid "Setup Filter..."
+msgstr "Setup Filter..."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 223
+#: rc.cpp:879
+#, no-c-format
+msgid "Location:"
+msgstr "Location:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 231
+#: rc.cpp:882
+#, no-c-format
+msgid "Use filter"
+msgstr "Use filter"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 40
+#: rc.cpp:885 rc.cpp:933
+#, no-c-format
+msgid "&Path to Compendium File"
+msgstr "&Path to Compendium File"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 102
+#: rc.cpp:891
+#, no-c-format
+msgid "Ignore &fuzzy strings"
+msgstr "Ignore &fuzzy strings"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 113
+#: rc.cpp:894 rc.cpp:939
+#, no-c-format
+msgid "Onl&y whole words"
+msgstr "Onl&y whole words"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 124
+#: rc.cpp:897 rc.cpp:942
+#, no-c-format
+msgid "Case sensiti&ve"
+msgstr "Case sensiti&ve"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 148
+#: rc.cpp:900 rc.cpp:945
+#, no-c-format
+msgid "A text matches if:"
+msgstr "A text matches if:"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 174
+#: rc.cpp:903 rc.cpp:948
+#, no-c-format
+msgid "E&qual to searched text"
+msgstr "E&qual to searched text"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 185
+#: rc.cpp:906 rc.cpp:951
+#, no-c-format
+msgid "Contains a &word of searched text"
+msgstr "Contains a &word of searched text"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 196
+#: rc.cpp:909 rc.cpp:954
+#, no-c-format
+msgid "Co&ntained in searched text"
+msgstr "Co&ntained in searched text"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 207
+#: rc.cpp:912 rc.cpp:957
+#, no-c-format
+msgid "&Similar to searched text"
+msgstr "&Similar to searched text"
+
+#. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 218
+#: rc.cpp:915 rc.cpp:960
+#, no-c-format
+msgid "Contains searched te&xt"
+msgstr "Contains searched te&xt"
+
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 39
+#: rc.cpp:918
+#, no-c-format
+msgid "&Path to auxiliary file:"
+msgstr "&Path to auxiliary file:"
+
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 61
+#: rc.cpp:921
+#, no-c-format
+msgid "&Ignore fuzzy entries"
+msgstr "&Ignore fuzzy entries"
+
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 78
+#: rc.cpp:924
+#, no-c-format
 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>"
+"<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>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>"
+"<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>"
 
-#: commonui/projectwizard.cpp:78
-msgid "Basic Project Information"
-msgstr "Basic Project Information"
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 632
+#: rc.cpp:1095
+#, no-c-format
+msgid "Scan Single PO File..."
+msgstr "Scan Single PO File..."
 
-#: commonui/projectwizard.cpp:83
-msgid "Translation Files"
-msgstr "Translation Files"
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 640
+#: rc.cpp:1098
+#, no-c-format
+msgid "Scan Folder..."
+msgstr "Scan Folder..."
 
-#: commonui/projectwizard.cpp:140
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 648
+#: rc.cpp:1101
+#, no-c-format
+msgid "Scan Folder && Subfolders..."
+msgstr "Scan Folder && Subfolders..."
+
+#. i18n: file ./catalogmanager/validationoptions.ui line 32
+#: rc.cpp:1168
+#, no-c-format
+msgid "Mark invalid as &fuzzy"
+msgstr "Mark invalid as &fuzzy"
+
+#. i18n: file ./catalogmanager/validationoptions.ui line 39
+#: rc.cpp:1171
+#, no-c-format
 msgid ""
-"The file '%1' already exists.\n"
-"Do you want to replace it?"
+"<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 ""
-"The file '%1' already exists.\n"
-"Do you want to replace it?"
+"<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>"
 
-#: commonui/projectwizard.cpp:141
-msgid "File Exists"
-msgstr "File Exists"
+#. i18n: file ./catalogmanager/validationoptions.ui line 47
+#: rc.cpp:1178
+#, no-c-format
+msgid "&Do not validate fuzzy"
+msgstr "&Do not validate fuzzy"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:50
-msgid "Catalog Information"
-msgstr "Catalogue Information"
+#. i18n: file ./catalogmanager/validationoptions.ui line 52
+#: rc.cpp:1181
+#, no-c-format
+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>"
+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>"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:53
-msgid "Total Messages"
-msgstr "Total Messages"
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 30
+#: rc.cpp:1192
+#, no-c-format
+msgid "&Markings"
+msgstr "&Markings"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:54
-msgid "Fuzzy Messages"
-msgstr "Fuzzy Messages"
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 60
+#: rc.cpp:1201 rc.cpp:1219 rc.cpp:1225
+#, no-c-format
+msgid "CVS"
+msgstr "CVS"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:55
-msgid "Untranslated Messages"
-msgstr "Untranslated Messages"
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 78
+#: catalogmanager/future.cpp:4 rc.cpp:1204 rc.cpp:1222 rc.cpp:1228
+#, no-c-format
+msgid "SVN"
+msgstr "SVN"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:56
-#: catalogmanager/catalogmanagerview.cpp:96
-msgid "Last Translator"
-msgstr "Last Translator"
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 24
+#: rc.cpp:1231
+#, no-c-format
+msgid "To be set dynamically:"
+msgstr "To be set dynamically:"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:57
-msgid "Language Team"
-msgstr "Language Team"
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 62
+#: rc.cpp:1240
+#, no-c-format
+msgid "&Include templates"
+msgstr "&Include templates"
 
-#: addons/tdefile-plugins/tdefile_po.cpp:58
-msgid "Revision"
-msgstr "Revision"
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 70
+#: rc.cpp:1243
+#, no-c-format
+msgid "Use &wildcards"
+msgstr "Use &wildcards"
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 38
+#: kbabeldict/kbabeldictbox.cpp:208 rc.cpp:1252
+#, no-c-format
+msgid "Current:"
+msgstr "Current:"
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 59
+#: rc.cpp:1255
+#, no-c-format
+msgid "Overall:"
+msgstr "Overall:"
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 80
+#: rc.cpp:1258
+#, no-c-format
+msgid "Current file:"
+msgstr "Current file:"
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 88
+#: rc.cpp:1261
+#, no-c-format
+msgid "Validation:"
+msgstr "Validation:"
 
 #: _translatorinfo.cpp:1 kbabeldict/main.cpp:121
 msgid ""
@@ -1359,93 +3157,351 @@ msgid ""
 "Your emails"
 msgstr "malcolm.hunter@gmx.co.uk"
 
-#: datatools/punctuation/main.cc:58
+#: kbabel/kbabelview2.cpp:538
+#, c-format
 msgid ""
-"_: what check found errors\n"
-"punctuation"
-msgstr "punctuation"
+"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"
 
-#: datatools/whitespace/main.cc:60
+#: 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"
+
+#: catalogmanager/multiroughtransdlg.cpp:84
+#: catalogmanager/multiroughtransdlg.cpp:96 kbabel/kbabelview.cpp:1182
+#: kbabel/kbabelview.cpp:1304 kbabel/kbabelview2.cpp:724
 msgid ""
-"_: which check found errors\n"
-"whitespace only translation"
-msgstr "whitespace only translation"
+"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."
 
-#: datatools/equations/main.cc:58
+#: kbabel/kbabelview.cpp:1207 kbabel/kbabelview.cpp:1325
+#: kbabel/kbabelview2.cpp:731
+#, c-format
 msgid ""
-"_: what check found errors\n"
-"equations"
-msgstr "equations"
+"You do not have permissions to read file:\n"
+" %1"
+msgstr ""
+"You do not have permissions to read file:\n"
+" %1"
 
-#: datatools/not-translated/main.cc:60
+#: kbabel/kbabelview.cpp:1213 kbabel/kbabelview.cpp:1330
+#: kbabel/kbabelview2.cpp:738
+#, c-format
 msgid ""
-"_: which check found errors\n"
-"English text in translation"
-msgstr "English text in translation"
+"You have not specified a valid file:\n"
+" %1"
+msgstr ""
+"You have not specified a valid file:\n"
+" %1"
 
-#: datatools/xml/main.cc:60
+#: kbabel/kbabelview.cpp:1219 kbabel/kbabelview.cpp:1336
+#: kbabel/kbabelview.cpp:1488 kbabel/kbabelview2.cpp:745
+#, c-format
 msgid ""
-"_: what check found errors\n"
-"XML tags"
-msgstr "XML tags"
+"KBabel cannot find a corresponding plugin for the MIME type of the file:\n"
+" %1"
+msgstr ""
+"KBabel cannot find a corresponding plugin for the MIME type of the file:\n"
+" %1"
 
-#: datatools/accelerators/main.cc:58
+#: kbabel/kbabelview.cpp:1225 kbabel/kbabelview.cpp:1342
+#: kbabel/kbabelview2.cpp:751
+#, c-format
 msgid ""
-"_: what check found errors\n"
-"accelerator"
-msgstr "accelerator"
+"The import plugin cannot handle this type of the file:\n"
+" %1"
+msgstr ""
+"The import plugin cannot handle this type of the file:\n"
+" %1"
 
-#: datatools/length/main.cc:61 datatools/regexp/main.cc:55
+#: catalogmanager/catalogmanagerview.cpp:448
+#: catalogmanager/catalogmanagerview.cpp:483 kbabel/kbabelview.cpp:1233
+#: kbabel/kbabelview.cpp:1349 kbabel/kbabelview2.cpp:757
+#, c-format
 msgid ""
-"_: which check found errors\n"
-"translation has inconsistent length"
-msgstr "translation has inconsistent length"
+"Error while trying to open file:\n"
+" %1"
+msgstr ""
+"Error while trying to open file:\n"
+" %1"
 
-#: datatools/regexp/main.cc:58
-msgid "Error loading data (%1)"
-msgstr "Error loading data (%1)"
+#: 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."
 
-#: datatools/regexp/main.cc:118
-msgid "File not found"
-msgstr "File not found"
+#: kbabel/kbabelview2.cpp:810
+msgid "Do not show in this find/replace session again"
+msgstr "Do not show in this find/replace session again"
 
-#: datatools/regexp/main.cc:123
-msgid "The file is not a XML"
-msgstr "The file is not a XML"
+#: kbabel/kbabelview2.cpp:825
+msgid "Enter new package for the current file:"
+msgstr "Enter new package for the current file:"
 
-#: datatools/regexp/main.cc:147
-msgid "Expected tag 'item'"
-msgstr "Expected tag 'item'"
+#: kbabel/kbabelview.cpp:1769 kbabel/kbabelview2.cpp:948
+msgid "No mismatch has been found."
+msgstr "No mismatch has been found."
 
-#: datatools/regexp/main.cc:153
-msgid "First child of 'item' is not a node"
-msgstr "First child of 'item' is not a node"
+#: kbabel/kbabelview.cpp:1784 kbabel/kbabelview2.cpp:965
+msgid ""
+"Some mismatches have been found.\n"
+"Please check the questionable entries by using Go->Next error"
+msgstr ""
+"Some mismatches have been found.\n"
+"Please tick the questionable entries by using Go->Next error"
 
-#: datatools/regexp/main.cc:159
-msgid "Expected tag 'name'"
-msgstr "Expected tag 'name'"
+#: 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"
 
-#: datatools/regexp/main.cc:167
-msgid "Expected tag 'exp'"
-msgstr "Expected tag 'exp'"
+#: kbabel/kbabelview2.cpp:1024
+msgid "Word Count"
+msgstr "Word Count"
 
-#: datatools/pluralforms/main.cc:59
+#: kbabel/charselectview.cpp:64 kbabel/kbcharselect.cpp:52
+msgid "Table:"
+msgstr "Table:"
+
+#: kbabel/charselectview.cpp:84
 msgid ""
-"_: what check found errors\n"
-"plural forms"
-msgstr "plural forms"
+"<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>"
 
-#: datatools/context/main.cc:58
+#: kbabel/headereditor.cpp:60
+msgid "&Apply Settings"
+msgstr "&Apply Settings"
+
+#: kbabel/headereditor.cpp:61
 msgid ""
-"_: what check found errors\n"
-"context info"
-msgstr "context info"
+"<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 ""
+"<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>"
 
-#: datatools/arguments/main.cc:57
+#: kbabel/headereditor.cpp:65
+msgid "&Reset"
+msgstr "&Reset"
+
+#: 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/headereditor.cpp:111
+#, c-format
+msgid "Header Editor for %1"
+msgstr "Header Editor for %1"
+
+#: kbabel/headereditor.cpp:136
 msgid ""
-"_: what check found errors\n"
-"arguments"
-msgstr "arguments"
+"<qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating!</p></qt>"
+msgstr ""
+"<qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating!</p></qt>"
+
+#: kbabel/headereditor.cpp:172
+msgid ""
+"<qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating.</p></qt>"
+msgstr ""
+"<qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating.</p></qt>"
+
+#: 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>"
+
+#: kbabel/main.cpp:537
+msgid "Go to entry with msgid <msgid>"
+msgstr "Go to entry with msgid <msgid>"
+
+#: kbabel/main.cpp:538 kbabeldict/main.cpp:105
+msgid "Disable splashscreen at startup"
+msgstr "Disable splashscreen at startup"
+
+#: catalogmanager/main.cpp:178 kbabel/main.cpp:539
+msgid "File to load configuration from"
+msgstr "File to load configuration from"
+
+#: kbabel/main.cpp:540
+msgid "Files to open"
+msgstr "Files to open"
+
+#: kbabel/main.cpp:547
+msgid "KBabel"
+msgstr "KBabel"
+
+#: kbabel/main.cpp:548
+msgid "An advanced PO file editor"
+msgstr "An advanced PO file editor"
+
+#: 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: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."
+
+#: 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."
+
+#: catalogmanager/main.cpp:191 kbabel/main.cpp:558
+#, fuzzy
+msgid "Current maintainer, porting to KDE3/Qt3."
+msgstr "Current maintainer, porting to TDE3/Qt3."
+
+#: 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"
+
+#: kbabel/main.cpp:562
+msgid "Translation List View"
+msgstr "Translation List View"
+
+#: 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:204 kbabel/main.cpp:572
+#, fuzzy
+msgid ""
+"Helped keep KBabel up to date with the KDE 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."
+
+#: 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"
+
+#: kbabel/gotodialog.cpp:41 kbabel/gotodialog.cpp:43
+msgid "Go to Entry"
+msgstr "Go to Entry"
 
 #: kbabel/kbabelview.cpp:185
 msgid ""
@@ -1684,18 +3740,6 @@ 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"
@@ -1714,57 +3758,6 @@ msgstr ""
 "The file contained syntax errors and an attempt has been made to recover it.\n"
 "Please tick the questionable entries by using Go->Next error"
 
-#: kbabel/kbabelview.cpp:1207 kbabel/kbabelview.cpp:1325
-#: kbabel/kbabelview2.cpp:731
-#, c-format
-msgid ""
-"You do not have permissions to read file:\n"
-" %1"
-msgstr ""
-"You do not have permissions to read file:\n"
-" %1"
-
-#: kbabel/kbabelview.cpp:1213 kbabel/kbabelview.cpp:1330
-#: kbabel/kbabelview2.cpp:738
-#, c-format
-msgid ""
-"You have not specified a valid file:\n"
-" %1"
-msgstr ""
-"You have not specified a valid file:\n"
-" %1"
-
-#: kbabel/kbabelview.cpp:1219 kbabel/kbabelview.cpp:1336
-#: kbabel/kbabelview.cpp:1488 kbabel/kbabelview2.cpp:745
-#, c-format
-msgid ""
-"KBabel cannot find a corresponding plugin for the MIME type of the file:\n"
-" %1"
-msgstr ""
-"KBabel cannot find a corresponding plugin for the MIME type of the file:\n"
-" %1"
-
-#: kbabel/kbabelview.cpp:1225 kbabel/kbabelview.cpp:1342
-#: kbabel/kbabelview2.cpp:751
-#, c-format
-msgid ""
-"The import plugin cannot handle this type of the file:\n"
-" %1"
-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."
@@ -1936,24 +3929,12 @@ msgstr ""
 "Please make sure that you have installed\n"
 "the GNU gettext package properly."
 
-#: kbabel/kbabelview.cpp:1769 kbabel/kbabelview2.cpp:948
-msgid "No mismatch has been found."
-msgstr "No mismatch has been found."
-
 #: kbabel/kbabelview.cpp:1770 kbabel/kbabelview.cpp:1787
 msgid ""
 "_: Title in Dialog: Perform all checks\n"
 "Perform All Checks"
 msgstr "Perform All Checks"
 
-#: kbabel/kbabelview.cpp:1784 kbabel/kbabelview2.cpp:965
-msgid ""
-"Some mismatches have been found.\n"
-"Please check the questionable entries by using Go->Next error"
-msgstr ""
-"Some mismatches have been found.\n"
-"Please tick the questionable entries by using Go->Next error"
-
 #: kbabel/kbabel.cpp:942 kbabel/kbabelview.cpp:1803
 msgid ""
 "The document contains unsaved changes.\n"
@@ -2146,214 +4127,6 @@ msgstr "The spell checker program seems to have crashed."
 msgid "Searching"
 msgstr "Searching"
 
-#: kbabel/charselectview.cpp:64 kbabel/kbcharselect.cpp:52
-msgid "Table:"
-msgstr "Table:"
-
-#: kbabel/charselectview.cpp:84
-msgid ""
-"<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/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:"
-msgstr "Context inserted by KBabel, do not translate:"
-
-#: kbabel/hidingmsgedit.cpp:182
-#, c-format
-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
@@ -2628,12 +4401,6 @@ msgstr "Fuzzy: 0"
 msgid "Untranslated: 0"
 msgstr "Untranslated: 0"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 75
-#: kbabel/kbabel.cpp:713 rc.cpp:924
-#, no-c-format
-msgid "Status: "
-msgstr "Status: "
-
 #: kbabel/kbabel.cpp:731 kbabel/kbabel.cpp:1164
 msgid "INS"
 msgstr "INS"
@@ -2749,56 +4516,41 @@ msgstr ""
 "<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/gotodialog.cpp:41 kbabel/gotodialog.cpp:43
-msgid "Go to Entry"
-msgstr "Go to Entry"
+#: kbabel/kbcataloglistview.cpp:44
+msgid "Id"
+msgstr "Id"
 
-#: kbabel/headereditor.cpp:60
-msgid "&Apply Settings"
-msgstr "&Apply Settings"
+#: kbabel/kbcataloglistview.cpp:45
+msgid "Original String"
+msgstr "Original String"
 
-#: kbabel/headereditor.cpp:61
+#: kbabel/contextview.cpp:63
 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>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>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/headereditor.cpp:65
-msgid "&Reset"
-msgstr "&Reset"
-
-#: 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/headereditor.cpp:111
-#, c-format
-msgid "Header Editor for %1"
-msgstr "Header Editor for %1"
+"<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/headereditor.cpp:136
-msgid ""
-"<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating!</p></qt>"
-msgstr ""
-"<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating!</p></qt>"
+#: kbabel/contextview.cpp:99
+msgid "current entry"
+msgstr "current entry"
 
-#: kbabel/headereditor.cpp:172
+#: kbabel/contextview.cpp:140
 msgid ""
-"<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating.</p></qt>"
+"Plural %1: %2\n"
 msgstr ""
-"<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating.</p></qt>"
+"Plural %1: %2\n"
 
 #: kbabel/spelldlg.cpp:44
 msgid ""
@@ -2810,1956 +4562,317 @@ msgstr "Spelling"
 msgid "&Spell Check"
 msgstr "&Spell Check"
 
-#: kbabel/main.cpp:537
-msgid "Go to entry with msgid <msgid>"
-msgstr "Go to entry with msgid <msgid>"
-
-#: kbabel/main.cpp:538 kbabeldict/main.cpp:105
-msgid "Disable splashscreen at startup"
-msgstr "Disable splashscreen at startup"
-
-#: catalogmanager/main.cpp:178 kbabel/main.cpp:539
-msgid "File to load configuration from"
-msgstr "File to load configuration from"
-
-#: kbabel/main.cpp:540
-msgid "Files to open"
-msgstr "Files to open"
-
-#: kbabel/main.cpp:547
-msgid "KBabel"
-msgstr "KBabel"
-
-#: kbabel/main.cpp:548
-msgid "An advanced PO file editor"
-msgstr "An advanced PO file editor"
-
-#: 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: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."
-
-#: 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."
-
-#: catalogmanager/main.cpp:191 kbabel/main.cpp:558
-#, fuzzy
-msgid "Current maintainer, porting to KDE3/Qt3."
-msgstr "Current maintainer, porting to TDE3/Qt3."
-
-#: 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"
-
-#: kbabel/main.cpp:562
-msgid "Translation List View"
-msgstr "Translation List View"
-
-#: 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:204 kbabel/main.cpp:572
-#, fuzzy
-msgid ""
-"Helped keep KBabel up to date with the KDE 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."
-
-#: 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:3
-#, no-c-format
-msgid "Diff Source"
-msgstr "Diff Source"
-
-#. i18n: file ./commonui/diffpreferences.ui line 41
-#: rc.cpp:6
-#, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Source for difference lookup</b></p>\n"
-"<p>Here you can select a source, which should be used\n"
-"for finding a difference.</p>\n"
-"<p>You can select file, translation database or\n"
-"corresponding msgstr.</p>\n"
-"<p>If you choose the translation database, the messages to diff with are\n"
-"taken from the Translation Database; to be useful, you have\n"
-"to enable <i>Auto add entry to database</i> in its\n"
-"preferences dialog.</p>\n"
-"<p>The last option is useful for those using PO-files\n"
-"for proofreading.</p>\n"
-"<p>You can temporarily diff with messages from a file\n"
-"by choosing <i>Tools->Diff->Open file for diff</i>\n"
-"in KBabel's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Source for difference lookup</b></p>\n"
-"<p>Here you can select a source, which should be used\n"
-"for finding a difference.</p>\n"
-"<p>You can select file, translation database or\n"
-"corresponding msgstr.</p>\n"
-"<p>If you choose the translation database, the messages to diff with are\n"
-"taken from the Translation Database; to be useful, you have\n"
-"to enable <i>Auto add entry to database</i> in its\n"
-"preferences dialog.</p>\n"
-"<p>The last option is useful for those using PO-files\n"
-"for proofreading.</p>\n"
-"<p>You can temporarily diff with messages from a file\n"
-"by choosing <i>Tools->Diff->Open file for diff</i>\n"
-"in KBabel's main window.</p></qt>"
-
-#. i18n: file ./commonui/diffpreferences.ui line 52
-#: rc.cpp:22
-#, no-c-format
-msgid "Use &file"
-msgstr "Use &file"
-
-#. i18n: file ./commonui/diffpreferences.ui line 60
-#: 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: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: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:34
-#, no-c-format
-msgid ""
-"<qt><q><b>Base folder for diff files</b></q>\n"
-"<p>Here you can define a folder in which the files to\n"
-"diff with are stored. If the files are stored at the same\n"
-"place beneath this folder as the original files beneath\n"
-"their base folder, KBabel can automatically open the correct\n"
-"file to diff with.</p>\n"
-"<p>Note that this option has no effect if messages from\n"
-"the database are used for diffing.</p></qt>"
-msgstr ""
-"<qt><q><b>Base folder for diff files</b></q>\n"
-"<p>Here you can define a folder in which the files to\n"
-"diff with are stored. If the files are stored at the same\n"
-"place beneath this folder as the original files beneath\n"
-"their base folder, KBabel can automatically open the correct\n"
-"file to diff with.</p>\n"
-"<p>Note that this option has no effect if messages from\n"
-"the database are used for diffing.</p></qt>"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 38
-#: rc.cpp:44
-#, no-c-format
-msgid ""
-"<font size=\"+1\">Welcome to Project Wizard!</font>\n"
-"<br/>\n"
-"<p>\n"
-"The wizard will help you to setup a new translation\n"
-"project for KBabel.\n"
-"</p>\n"
-"<p>\n"
-"First of all, you need to choose the project name\n"
-"and the file, where the configuration should be stored.\n"
-"</p>\n"
-"<p>\n"
-"You should also choose a language to translate into\n"
-"and also a type of the translation project.\n"
-"</p>"
-msgstr ""
-"<font size=\"+1\">Welcome to Project Wizard!</font>\n"
-"<br/>\n"
-"<p>\n"
-"The wizard will help you to setup a new translation\n"
-"project for KBabel.\n"
-"</p>\n"
-"<p>\n"
-"First of all, you need to choose the project name\n"
-"and the file, where the configuration should be stored.\n"
-"</p>\n"
-"<p>\n"
-"You should also choose a language to translate into\n"
-"and also a type of the translation project.\n"
-"</p>"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 66
-#: rc.cpp:60 rc.cpp:137
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<p><b>Configuration File Name</b>"
-"<br/>\n"
-"The name of a file to store the configuration of the\n"
-"project.</p>\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<p><b>Configuration File Name</b>"
-"<br/>\n"
-"The name of a file to store the configuration of the\n"
-"project.</p>\n"
-"</qt>"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 74
-#: rc.cpp:67
-#, no-c-format
-msgid "&Language:"
-msgstr "&Language:"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 86
-#: rc.cpp:70 rc.cpp:92
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<p>\n"
-"<b>Language</b>"
-"<br/>\n"
-"The destination language of the project, i.e., the language\n"
-"to translate into. It should follow the ISO 631 language naming\n"
-"standard.</p>\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<p>\n"
-"<b>Language</b>"
-"<br/>\n"
-"The destination language of the project, i.e., the language\n"
-"to translate into. It should follow the ISO 631 language naming\n"
-"standard.</p>\n"
-"</qt>"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 97
-#: rc.cpp:79
-#, no-c-format
-msgid "Project &name:"
-msgstr "Project &name:"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 110
-#: rc.cpp:82 rc.cpp:124
-#, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Project name</b>"
-"<br/>\n"
-"The project name is an identification of a project for\n"
-"you. It is shown in the project configuration dialog\n"
-"as well as in the title of windows opened for the project.\n"
-"<br/>\n"
-"<br/>\n"
-"<b>Note:</b> The project name cannot be later changed.<\n"
-"</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Project name</b>"
-"<br/>\n"
-"The project name is an identification of a project for\n"
-"you. It is shown in the project configuration dialogue\n"
-"as well as in the title of windows opened for the project.\n"
-"<br/>\n"
-"<br/>\n"
-"<b>Note:</b> The project name cannot be later changed.<\n"
-"</p></qt>"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 135
-#: rc.cpp:101
-#, no-c-format
-msgid "Project &type:"
-msgstr "Project &type:"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 158
-#: rc.cpp:104 rc.cpp:156
-#, fuzzy, no-c-format
+#: kbabel/kbabelpref.cpp:57
 msgid ""
-"<qt>\n"
-"<p>\n"
-"<b>Project Type</b>\n"
-"The project type allows to tune the settings for the\n"
-"particular type of the well-known translation projects.\n"
-"For example, it sets up the validation tools,\n"
-"an accelerator marker and formatting of the header.\n"
-"</p>\n"
-"<p>Currently known types:\n"
-"<ul>\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"
-"done</li>\n"
-"</ul>\n"
-"</p>\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"<p>\n"
-"<b>Project Type</b>\n"
-"The project type allows to tune the settings for the\n"
-"particular type of the well-known translation projects.\n"
-"For example, it sets up the validation tools,\n"
-"an accelerator marker and formatting of the header.\n"
-"</p>\n"
-"<p>Currently known types:\n"
-"<ul>\n"
-"<li><b>TDE</b>: K Desktop Environment Internalisation 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"
-"done</li>\n"
-"</ul>\n"
-"</p>\n"
-"</qt>"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 184
-#: rc.cpp:134
-#, no-c-format
-msgid "Configuration &file name:"
-msgstr "Configuration &file name:"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 200
-#: rc.cpp:144
-#, no-c-format
-msgid "TDE"
-msgstr "TDE"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 205
-#: rc.cpp:147
-#, no-c-format
-msgid "GNOME"
-msgstr "GNOME"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 210
-#: rc.cpp:150
-#, no-c-format
-msgid "Translation Project Robot"
-msgstr "Translation Project Robot"
-
-#. i18n: file ./commonui/projectwizardwidget.ui line 215
-#: rc.cpp:153
-#, no-c-format
-msgid "Other"
-msgstr "Other"
+"_: title of page in preferences dialog\n"
+"Edit"
+msgstr "Edit"
 
-#. i18n: file ./commonui/projectwizardwidget2.ui line 18
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Translation Files</b></p>\n"
-"<p>Type in the folders which contain all your PO and POT files.\n"
-"The files and the folders in these folders will then be merged into one "
-"tree.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Translation Files</b></p>\n"
-"<p>Type in the folders which contain all your PO and POT files.\n"
-"The files and the folders in these folders will then be merged into one "
-"tree.</p></qt>"
+#: kbabel/kbabelpref.cpp:59
+msgid "Options for Editing"
+msgstr "Options for Editing"
 
-#. i18n: file ./commonui/projectwizardwidget2.ui line 44
-#: rc.cpp:181
-#, no-c-format
+#: kbabel/kbabelpref.cpp:70
 msgid ""
-"<font size=\"+1\">The Translation Files</font>\n"
-"<br/>"
-"<br/>\n"
-"If the project contains more than one file to translate, it\n"
-"better to organize the files. \n"
-"\n"
-"KBabel distinguishes two kind of the translation files:\n"
-"\n"
-"<ul>\n"
-"<li><b>Templates</b>: the files to be translated</li>\n"
-"<li><b>Translated files</b>: the files already translated (at least\n"
-"partially)</li>\n"
-"</ul>\n"
-"\n"
-"Choose the folders to store the files. If you\n"
-"leave the entries empty, the Catalog Manager\n"
-"will not work."
-msgstr ""
-"<font size=\"+1\">The Translation Files</font>\n"
-"<br/>"
-"<br/>\n"
-"If the project contains more than one file to translate, it\n"
-"better to organise the files. \n"
-"\n"
-"KBabel distinguishes two kind of the translation files:\n"
-"\n"
-"<ul>\n"
-"<li><b>Templates</b>: the files to be translated</li>\n"
-"<li><b>Translated files</b>: the files already translated (at least\n"
-"partially)</li>\n"
-"</ul>\n"
-"\n"
-"Choose the folders to store the files. If you\n"
-"leave the entries empty, the Catalogue Manager\n"
-"will not work."
-
-#. i18n: file ./commonui/tdelisteditor.ui line 94
-#: rc.cpp:205 rc.cpp:861 rc.cpp:1246
-#, no-c-format
-msgid "New Item"
-msgstr "New Item"
-
-#. i18n: file ./commonui/tdelisteditor.ui line 151
-#: rc.cpp:214
-#, no-c-format
-msgid "Up"
-msgstr "Up"
-
-#. i18n: file ./commonui/tdelisteditor.ui line 162
-#: rc.cpp:217
-#, no-c-format
-msgid "Down"
-msgstr "Down"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 24
-#: rc.cpp:220
-#, no-c-format
-msgid "Choose What You Want to Spell Check"
-msgstr "Choose What You Want to Spell Check"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 30
-#: rc.cpp:223 rc.cpp:235
-#, no-c-format
-msgid "Spell check only the current message."
-msgstr "Spell check only the current message."
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 41
-#: rc.cpp:226
-#, no-c-format
-msgid "A&ll messages"
-msgstr "A&ll messages"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 44
-#: rc.cpp:229
-#, no-c-format
-msgid "Spell check all translated messages of this file."
-msgstr "Spell check all translated messages of this file."
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 52
-#: rc.cpp:232
-#, no-c-format
-msgid "C&urrent message only"
-msgstr "C&urrent message only"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 66
-#: rc.cpp:238
-#, 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"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 74
-#: rc.cpp:241
-#, no-c-format
-msgid "&From beginning of file to cursor position"
-msgstr "&From beginning of file to cursor position"
+"_: title of page in preferences dialog\n"
+"Search"
+msgstr "Search"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 77
-#: rc.cpp:244
-#, 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."
+#: kbabel/kbabelpref.cpp:72
+msgid "Options for Searching Similar Translations"
+msgstr "Options for Searching Similar Translations"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 85
-#: rc.cpp:247
-#, no-c-format
-msgid "F&rom cursor position to end of file"
-msgstr "F&rom cursor position to end of file"
+#: kbabel/kbabelpref.cpp:87
+msgid "Options for Showing Differences"
+msgstr "Options for Showing Differences"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 88
-#: rc.cpp:250
-#, no-c-format
+#: kbabel/kbabelpref.cpp:90
 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/spelldlgwidget.ui line 96
-#: rc.cpp:253
-#, no-c-format
-msgid "S&elected text only"
-msgstr "S&elected text only"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 99
-#: rc.cpp:256
-#, no-c-format
-msgid "Spell check only the selected text."
-msgstr "Spell check only the selected text."
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 109
-#: rc.cpp:259
-#, no-c-format
-msgid "U&se this selection as default"
-msgstr "U&se this selection as default"
-
-#. i18n: file ./kbabel/spelldlgwidget.ui line 112
-#: rc.cpp:262
-#, 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."
-
-#. i18n: file ./kbabel/headerwidget.ui line 43
-#: rc.cpp:268
-#, no-c-format
-msgid "&Header:"
-msgstr "&Header:"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 54
-#: rc.cpp:274
-#, no-c-format
-msgid "A&utomatically unset fuzzy status"
-msgstr "A&utomatically unset fuzzy status"
+"_: name of page in preferences dialog icon list\n"
+"Fonts"
+msgstr "Fonts"
 
-#. i18n: file ./kbabel/editorpreferences.ui line 60
-#: rc.cpp:277
-#, no-c-format
+#: kbabel/kbabelpref.cpp:92
 msgid ""
-"<qt>"
-"<p><b>Automatically unset fuzzy status</b></p>\n"
-"<p>If this is activated and you are editing a fuzzy entry, the fuzzy status is "
-"automatically\n"
-"unset (this means the string <i>, fuzzy</i>\n"
-"is removed from the entry's comment).</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Automatically unset fuzzy status</b></p>\n"
-"<p>If this is activated and you are editing a fuzzy entry, the fuzzy status is "
-"automatically\n"
-"unset (this means the string <i>, fuzzy</i>\n"
-"is removed from the entry's comment).</p></qt>"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 68
-#: rc.cpp:283
-#, no-c-format
-msgid "Use cle&ver editing"
-msgstr "Use cle&ver editing"
+"_: title of page in preferences dialog\n"
+"Font Settings"
+msgstr "Font Settings"
 
-#. i18n: file ./kbabel/editorpreferences.ui line 79
-#: rc.cpp:286
-#, no-c-format
+#: kbabel/kbabelpref.cpp:95
 msgid ""
-"<qt>"
-"<p><b>Use clever editing</b></p>\n"
-"<p>Check this to make typing text more comfortable and let \n"
-"KBabel take care of some special characters that have to \n"
-"be quoted. For example typing '\\\"' will result in \n"
-"'\\\\\\\"', pressing Return will automatically add whitespace \n"
-"at the end of the line, pressing Shift+Return will add \n"
-"'\\\\n' at the end of the line.</p>\n"
-"<p>Note that this is just a hint: it is still possible to \n"
-"generate syntactically incorrect text.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Use clever editing</b></p>\n"
-"<p>Check this to make typing text more comfortable and let \n"
-"KBabel take care of some special characters that have to \n"
-"be quoted. For example typing '\\\"' will result in \n"
-"'\\\\\\\"', pressing Return will automatically add whitespace \n"
-"at the end of the line, pressing Shift+Return will add \n"
-"'\\\\n' at the end of the line.</p>\n"
-"<p>Note that this is just a hint: it is still possible to \n"
-"generate syntactically incorrect text.</p></qt>"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 89
-#: rc.cpp:297
-#, no-c-format
-msgid "Automatic Checks"
-msgstr "Automatic Checks"
+"_: name of page in preferences dialog icon list\n"
+"Colors"
+msgstr "Colours"
 
-#. i18n: file ./kbabel/editorpreferences.ui line 97
-#: rc.cpp:300
-#, no-c-format
+#: kbabel/kbabelpref.cpp:97
 msgid ""
-"<qt>"
-"<p><b>Error recognition</b></p>\n"
-"<p>Here you can set how to show that an error occurred. \n"
-"<b>Beep on error</b> beeps and <b>Change text color on error\n"
-"</b> changes the color of the translated text. If none is \n"
-"activated, you will still see a message in the statusbar.\n"
-"</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Error recognition</b></p>\n"
-"<p>Here you can set how to show that an error occurred. \n"
-"<b>Beep on error</b> beeps and <b>Change text colour on error\n"
-"</b> changes the colour of the translated text. If none is \n"
-"activated, you will still see a message in the statusbar.\n"
-"</p></qt>"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 113
-#: rc.cpp:308
-#, no-c-format
-msgid "&Beep on error"
-msgstr "&Beep on error"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 121
-#: 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:314
-#, no-c-format
-msgid "A&ppearance"
-msgstr "A&ppearance"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 175
-#: rc.cpp:317
-#, no-c-format
-msgid "H&ighlight syntax"
-msgstr "H&ighlight syntax"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 183
-#: rc.cpp:320
-#, no-c-format
-msgid "Highlight backgrou&nd"
-msgstr "Highlight backgrou&nd"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 191
-#: rc.cpp:323
-#, no-c-format
-msgid "Mark &whitespaces with points"
-msgstr "Mark &white spaces with points"
+"_: title of page in preferences dialog\n"
+"Color Settings"
+msgstr "Colour Settings"
 
-#. i18n: file ./kbabel/editorpreferences.ui line 199
-#: rc.cpp:326
-#, no-c-format
-msgid "&Show surrounding quotes"
-msgstr "&Show surrounding quotes"
+#: kbabel/hidingmsgedit.cpp:76
+msgid "Context inserted by KBabel, do not translate:"
+msgstr "Context inserted by KBabel, do not translate:"
 
-#. i18n: file ./kbabel/editorpreferences.ui line 209
-#: rc.cpp:329
-#, no-c-format
-msgid "Status LEDs"
-msgstr "Status LEDs"
+#: kbabel/hidingmsgedit.cpp:182
+#, c-format
+msgid "Plural %1"
+msgstr "Plural %1"
 
-#. i18n: file ./kbabel/editorpreferences.ui line 213
-#: rc.cpp:332
-#, no-c-format
+#: datatools/pluralforms/main.cc:59
 msgid ""
-"<qt>"
-"<p><b>Status LEDs</b></p>\n"
-"<p>Choose here where the status LEDs are displayed and what color they have.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p><b>Status LEDs</b></p>\n"
-"<p>Choose here where the status LEDs are displayed and what colour they "
-"have.</p></qt>"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 224
-#: 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:339
-#, no-c-format
-msgid "Display in edi&tor"
-msgstr "Display in edi&tor"
-
-#. i18n: file ./kbabel/editorpreferences.ui line 260
-#: rc.cpp:342 rc.cpp:363
-#, no-c-format
-msgid "Colo&r:"
-msgstr "Colou&r:"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 36
-#: rc.cpp:348
-#, no-c-format
-msgid "Added Characters"
-msgstr "Added Characters"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 44
-#: 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:354
-#, no-c-format
-msgid "Co&lor:"
-msgstr "Co&lour:"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 66
-#: rc.cpp:357
-#, no-c-format
-msgid "Removed Characters"
-msgstr "Removed Characters"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 74
-#: rc.cpp:360
-#, no-c-format
-msgid "How &to display:"
-msgstr "How &to display:"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 94
-#: rc.cpp:366 rc.cpp:372
-#, no-c-format
-msgid "Highlighted"
-msgstr "Highlighted"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 99
-#: rc.cpp:369
-#, no-c-format
-msgid "Underlined"
-msgstr "Underlined"
-
-#. i18n: file ./kbabel/editordiffpreferences.ui line 129
-#: rc.cpp:375
-#, no-c-format
-msgid "Stroked Out"
-msgstr "Stroked Out"
-
-#. i18n: file ./kbabel/colorpreferences.ui line 41
-#: rc.cpp:378
-#, no-c-format
-msgid "&Background color:"
-msgstr "&Background colour:"
-
-#. i18n: file ./kbabel/colorpreferences.ui line 52
-#: rc.cpp:381
-#, no-c-format
-msgid "Color for &quoted characters:"
-msgstr "Colour for &quoted characters:"
-
-#. i18n: file ./kbabel/colorpreferences.ui line 63
-#: rc.cpp:384
-#, no-c-format
-msgid "Color for &syntax errors:"
-msgstr "Colour for &syntax errors:"
-
-#. i18n: file ./kbabel/colorpreferences.ui line 82
-#: rc.cpp:387
-#, no-c-format
-msgid "Color for s&pellcheck errors:"
-msgstr "Colour for s&pellcheck errors:"
+"_: what check found errors\n"
+"plural forms"
+msgstr "plural forms"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 97
-#: rc.cpp:390
-#, no-c-format
+#: datatools/punctuation/main.cc:58
 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/colorpreferences.ui line 105
-#: rc.cpp:394
-#, no-c-format
-msgid "Color for &keyboard accelerators:"
-msgstr "Colour for &keyboard accelerators:"
-
-#. i18n: file ./kbabel/colorpreferences.ui line 132
-#: rc.cpp:397
-#, no-c-format
-msgid "Color for c-for&mat characters:"
-msgstr "Colour for c-for&mat characters:"
-
-#. i18n: file ./kbabel/colorpreferences.ui line 151
-#: rc.cpp:400
-#, no-c-format
-msgid "Color for &tags:"
-msgstr "Colour for &tags:"
-
-#. i18n: file ./kbabel/kbabelui.rc line 29
-#: rc.cpp:409 rc.cpp:1171
-#, no-c-format
-msgid "&Go"
-msgstr "&Go"
-
-#. 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"
+"_: what check found errors\n"
+"punctuation"
+msgstr "punctuation"
 
-#. i18n: file ./kbabel/searchpreferences.ui line 49
-#: rc.cpp:445
-#, no-c-format
+#: datatools/accelerators/main.cc:58
 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>"
-
-#. i18n: file ./kbabel/searchpreferences.ui line 65
-#: rc.cpp:455
-#, no-c-format
-msgid "D&efault dictionary:"
-msgstr "D&efault dictionary:"
+"_: what check found errors\n"
+"accelerator"
+msgstr "accelerator"
 
-#. i18n: file ./kbabel/searchpreferences.ui line 82
-#: rc.cpp:458
-#, no-c-format
+#: datatools/context/main.cc:58
 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/fontpreferences.ui line 25
-#: rc.cpp:467
-#, no-c-format
-msgid "Font for Messages"
-msgstr "Font for Messages"
-
-#. i18n: file ./kbabel/fontpreferences.ui line 36
-#: rc.cpp:470
-#, no-c-format
-msgid "&Show only fixed font"
-msgstr "&Show only fixed font"
-
-#. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 30
-#: 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: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: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: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: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: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: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: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: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:509
-#, no-c-format
-msgid "Ignore &fuzzy strings"
-msgstr "Ignore &fuzzy strings"
-
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 39
-#: rc.cpp:536
-#, no-c-format
-msgid "&Path to auxiliary file:"
-msgstr "&Path to auxiliary file:"
-
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 61
-#: rc.cpp:539
-#, no-c-format
-msgid "&Ignore fuzzy entries"
-msgstr "&Ignore fuzzy entries"
+"_: what check found errors\n"
+"context info"
+msgstr "context info"
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 78
-#: rc.cpp:542
-#, no-c-format
+#: datatools/equations/main.cc:58
 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/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/dbsearchengine/dbseprefwidget.ui line 55
-#: rc.cpp:554 rc.cpp:966
-#, no-c-format
-msgid "Search Mode"
-msgstr "Search Mode"
-
-#. 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)"
+"_: what check found errors\n"
+"equations"
+msgstr "equations"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 77
-#: rc.cpp:560 rc.cpp:972
-#, no-c-format
+#: datatools/xml/main.cc:60
 msgid ""
-"<qml>Scroll the whole database and return everything that matches \n"
-"according to the rules defined in tabs <strong> Generic </strong>\n"
-"and <strong>Match</strong>"
-msgstr ""
-"<qml>Scroll the whole database and return everything that matches \n"
-"according to the rules defined in tabs <strong> Generic </strong>\n"
-"and <strong>Match</strong>"
-
-#. 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)"
+"_: what check found errors\n"
+"XML tags"
+msgstr "XML tags"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 92
-#: rc.cpp:568 rc.cpp:980
-#, no-c-format
+#: datatools/arguments/main.cc:57
 msgid ""
-"<qml>Search in a list of <em>good keys</em> (see <strong>Good keys</strong> "
-"tab) with rules defined in <strong>Search</strong> tab.\n"
-"This is the best way to search because the <em>good keys</em> "
-"list probably contains all the keys that match with your query. However, it is "
-"smaller than the whole database."
-msgstr ""
-"<qml>Search in a list of <em>good keys</em> (see <strong>Good keys</strong> "
-"tab) with rules defined in <strong>Search</strong> tab.\n"
-"This is the best way to search because the <em>good keys</em> "
-"list probably contains all the keys that match with your query. However, it is "
-"smaller than the whole database."
-
-#. 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)"
+"_: what check found errors\n"
+"arguments"
+msgstr "arguments"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 103
-#: rc.cpp:575 rc.cpp:987
-#, no-c-format
+#: datatools/whitespace/main.cc:60
 msgid ""
-"<qml>Returns the whole <em>good keys</em> list. Rules defined in <strong>"
-"Search</strong> tab are ignored."
-msgstr ""
-"<qml>Returns the whole <em>good keys</em> list. Rules defined in <strong>"
-"Search</strong> tab are ignored."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 113
-#: rc.cpp:578 rc.cpp:990
-#, no-c-format
-msgid "Case sensitive"
-msgstr "Case sensitive"
+"_: which check found errors\n"
+"whitespace only translation"
+msgstr "whitespace only translation"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 116
-#: rc.cpp:581 rc.cpp:993
-#, no-c-format
+#: datatools/not-translated/main.cc:60
 msgid ""
-"<qml>If it is checked the search will be case sensitive. It is ignored if you "
-"use <em>Return the list of \"good keys\"</em> search mode."
-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/dbsearchengine/dbseprefwidget.ui line 124
-#: rc.cpp:584 rc.cpp:996
-#, no-c-format
-msgid "Normalize white space"
-msgstr "Normalise white space"
+"_: which check found errors\n"
+"English text in translation"
+msgstr "English text in translation"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 131
-#: rc.cpp:587 rc.cpp:999
-#, no-c-format
+#: datatools/length/main.cc:61 datatools/regexp/main.cc:55
 msgid ""
-"Remove white spaces at the beginning and at the end of the phrase.\n"
-"It also substitutes groups of more than one space character with only one space "
-"character."
-msgstr ""
-"Remove white spaces at the beginning and at the end of the phrase.\n"
-"It also substitutes groups of more than one space character with only one space "
-"character."
-
-#. 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/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/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/dbsearchengine/dbseprefwidget.ui line 209
-#: rc.cpp:600 rc.cpp:1012
-#, no-c-format
-msgid "Search"
-msgstr "Search"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 226
-#: rc.cpp:603 rc.cpp:1015
-#, no-c-format
-msgid "Matching Method"
-msgstr "Matching Method"
+"_: which check found errors\n"
+"translation has inconsistent length"
+msgstr "translation has inconsistent length"
 
-#. 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"
+#: datatools/regexp/main.cc:58
+msgid "Error loading data (%1)"
+msgstr "Error loading data (%1)"
 
-#. 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"
+#: datatools/regexp/main.cc:118
+msgid "File not found"
+msgstr "File not found"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 288
-#: rc.cpp:612 rc.cpp:1024
-#, no-c-format
-msgid "Query contains"
-msgstr "Query contains"
+#: datatools/regexp/main.cc:123
+msgid "The file is not a XML"
+msgstr "The file is not a XML"
 
-#. 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"
+#: datatools/regexp/main.cc:147
+msgid "Expected tag 'item'"
+msgstr "Expected tag 'item'"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 299
-#: rc.cpp:618 rc.cpp:1030
-#, no-c-format
-msgid "Normal text"
-msgstr "Normal text"
+#: datatools/regexp/main.cc:153
+msgid "First child of 'item' is not a node"
+msgstr "First child of 'item' is not a node"
 
-#. 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."
+#: datatools/regexp/main.cc:159
+msgid "Expected tag 'name'"
+msgstr "Expected tag 'name'"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 313
-#: rc.cpp:624 rc.cpp:1036
-#, no-c-format
-msgid "Equal"
-msgstr "Equal"
+#: datatools/regexp/main.cc:167
+msgid "Expected tag 'exp'"
+msgstr "Expected tag 'exp'"
 
-#. 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"
+#: filters/gettext/gettextimport.cpp:83
+msgid "loading file"
+msgstr "loading file"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 347
-#: rc.cpp:630 rc.cpp:1042
-#, no-c-format
-msgid "Regular expression"
-msgstr "Regular expression"
+#: filters/gettext/gettextexport.cpp:74
+msgid "saving file"
+msgstr "saving file"
 
-#. 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"
+#: kbabeldict/kbabeldict.cpp:45
+msgid "KBabelDict"
+msgstr "KBabelDict"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 360
-#: rc.cpp:636 rc.cpp:1048
-#, no-c-format
-msgid "Word Substitution"
-msgstr "Word Substitution"
+#: kbabeldict/kbabeldict.cpp:47
+msgid "About Module"
+msgstr "About Module"
 
-#. 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> "
-"each time you search a phrase with less than the specified number of words, the "
-"search engine will also search for all phrases that differ from the original "
-"one in one or two words."
-"<p>\n"
-"<strong>Example:</strong>"
-"<br>\n"
-"If you search for <em>My name is Andrea</em> and you have activated <em>"
-"one word substitution</em> you may also find phrases like <em>"
-"My name is Joe</em> or <em>Your name is Andrea</em>."
-msgstr ""
-"<qml>If you use one or two <em>word substitution</em> "
-"each time you search a phrase with less than the specified number of words, the "
-"search engine will also search for all phrases that differ from the original "
-"one in one or two words."
-"<p>\n"
-"<strong>Example:</strong>"
-"<br>\n"
-"If you search for <em>My name is Andrea</em> and you have activated <em>"
-"one word substitution</em> you may also find phrases like <em>"
-"My name is Joe</em> or <em>Your name is Andrea</em>."
+#: kbabeldict/kbabeldict.cpp:48 kbabeldict/kbabeldict.cpp:104
+msgid "Hide Sett&ings"
+msgstr "Hide Sett&ings"
 
-#. 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"
+#: kbabeldict/kbabeldict.cpp:108
+msgid "Show Sett&ings"
+msgstr "Show Sett&ings"
 
-#. 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:"
+#: kbabeldict/kbabeldictview.cpp:83
+msgid "Search in module:"
+msgstr "Search in module:"
 
-#. 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"
+#: kbabeldict/kbabeldictview.cpp:106
+msgid "&Start Search"
+msgstr "&Start Search"
 
-#. 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_%"
+#: kbabeldict/kbabeldictview.cpp:108
+msgid "Sea&rch in translations"
+msgstr "Sea&rch in translations"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 506
-#: rc.cpp:659 rc.cpp:1071
-#, no-c-format
-msgid "]"
-msgstr "]"
+#: kbabeldict/kbabeldictview.cpp:125
+msgid "Settings:"
+msgstr "Settings:"
 
-#. 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:"
+#: kbabeldict/main.cpp:114
+msgid "KBabel - Dictionary"
+msgstr "KBabel - Dictionary"
 
-#. 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"
+#: kbabeldict/main.cpp:115
+msgid "A dictionary for translators"
+msgstr "A dictionary for translators"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 570
-#: rc.cpp:668 rc.cpp:1080
-#, no-c-format
-msgid "Database folder:"
-msgstr "Database folder:"
+#: kbabeldict/main.cpp:116
+msgid "(c) 2000,2001,2002,2003 The KBabeldict developers"
+msgstr "(c) 2000,2001,2002,2003 The KBabeldict developers"
 
-#. 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"
+#: kbabeldict/aboutmoduledlg.cpp:42
+msgid "Report Bug..."
+msgstr "Report Bug..."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 592
-#: rc.cpp:674 rc.cpp:1086
-#, no-c-format
+#: kbabeldict/dictchooser.cpp:59
 msgid ""
-"Automatically add an entry to the database if a new translation is notified by "
-"someone (may be kbabel)"
-msgstr ""
-"Automatically add an entry to the database if a new translation is notified by "
-"someone (may be KBabel)"
-
-#. 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:"
+"_: dictionary to not use\n"
+"Do not use:"
+msgstr "Do not use:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 622
-#: rc.cpp:680 rc.cpp:1092
-#, no-c-format
+#: kbabeldict/dictchooser.cpp:62
 msgid ""
-"<qml>Put here the name and email address that you want to use as <em>"
-"last translator</em> filed when you auto-add entry to the database (e.g. when "
-"you modify a translation with kbabel)."
-"<p>"
-msgstr ""
-"<qml>Put here the name and email address that you want to use as <em>"
-"last translator</em> filed when you auto-add entry to the database (e.g. when "
-"you modify a translation with KBabel)."
-"<p>"
-
-#. 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..."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 640
-#: rc.cpp:686
-#, no-c-format
-msgid "Scan Folder..."
-msgstr "Scan Folder..."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 648
-#: rc.cpp:689
-#, no-c-format
-msgid "Scan Folder && Subfolders..."
-msgstr "Scan Folder && Subfolders..."
-
-#. 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/dbsearchengine/dbseprefwidget.ui line 678
-#: rc.cpp:695 rc.cpp:1107
-#, no-c-format
-msgid "Entries added:"
-msgstr "Entries added:"
-
-#. 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/dbsearchengine/dbseprefwidget.ui line 727
-#: rc.cpp:701 rc.cpp:1113
-#, no-c-format
-msgid "Processing file:"
-msgstr "Processing file:"
-
-#. 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/dbsearchengine/dbseprefwidget.ui line 776
-#: rc.cpp:707 rc.cpp:1119
-#, no-c-format
-msgid "Export..."
-msgstr "Export..."
+"_: dictionary to use\n"
+"Use:"
+msgstr "Use:"
 
-#. 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"
+#: kbabeldict/dictchooser.cpp:84
+msgid "Move &Up"
+msgstr "Move &Up"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 795
-#: rc.cpp:713 rc.cpp:1125
-#, no-c-format
-msgid "Repeated Strings"
-msgstr "Repeated Strings"
+#: kbabeldict/dictchooser.cpp:87
+msgid "Move &Down"
+msgstr "Move &Down"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 805
-#: rc.cpp:716 rc.cpp:1128
-#, no-c-format
-msgid "Good Keys"
-msgstr "Good Keys"
+#: kbabeldict/dictchooser.cpp:90
+msgid "Con&figure..."
+msgstr "Con&figure..."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 829
-#: rc.cpp:722 rc.cpp:1134
-#, no-c-format
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:562
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:614
 msgid ""
-"<qml>Here you can define how to fill the <em>good keys list</em>."
-"<p>\n"
-"You can set the minimum number of words of the query that a key must have to be "
-"inserted in the <em>good keys list</em>."
-"<p>\n"
-"You can also set the minimum number of words of the key that the query must "
-"have to insert the key in the list."
-"<p>\n"
-"These two numbers are the percentage of the total number of words. If the "
-"result of this percentage is less than one, the engine will set it to one."
-"<p>\n"
-"Finally you can set the maximum number of entries in the list."
+"The name you chose is already used.\n"
+"Please change the source name."
 msgstr ""
-"<qml>Here you can define how to fill the <em>good keys list</em>."
-"<p>\n"
-"You can set the minimum number of words of the query that a key must have to be "
-"inserted in the <em>good keys list</em>."
-"<p>\n"
-"You can also set the minimum number of words of the key that the query must "
-"have to insert the key in the list."
-"<p>\n"
-"These two numbers are the percentage of the total number of words. If the "
-"result of this percentage is less than one, the engine will set it to one."
-"<p>\n"
-"Finally you can set the maximum number of entries in the list."
-
-#. 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/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/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/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/dbsearchengine/dbseprefwidget.ui line 942
-#: rc.cpp:744 rc.cpp:1156
-#, no-c-format
-msgid "Frequent Words"
-msgstr "Frequent Words"
-
-#. 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/dbsearchengine/dbseprefwidget.ui line 967
-#: rc.cpp:750 rc.cpp:1162
-#, no-c-format
-msgid "/10000"
-msgstr "/10000"
-
-#. 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/dbsearchengine2/dbse2.ui line 28
-#: rc.cpp:756
-#, no-c-format
-msgid "General"
-msgstr "General"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 50
-#: rc.cpp:762
-#, no-c-format
-msgid "DB folder:"
-msgstr "DB folder:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 63
-#: rc.cpp:765
-#, no-c-format
-msgid "Automatic update in kbabel"
-msgstr "Automatic update in kbabel"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 73
-#: rc.cpp:768
-#, no-c-format
-msgid "New Entries"
-msgstr "New Entries"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 84
-#: kbabeldict/kbabeldictbox.cpp:1268 rc.cpp:771
-#, no-c-format
-msgid "Author:"
-msgstr "Author:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 92
-#: rc.cpp:774
-#, no-c-format
-msgid "From kbabel"
-msgstr "From kbabel"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 126
-#: rc.cpp:777
-#, no-c-format
-msgid "Algorithm"
-msgstr "Algorithm"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 137
-#: rc.cpp:780
-#, no-c-format
-msgid "Minimum score:"
-msgstr "Minimum score:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 176
-#: rc.cpp:783
-#, no-c-format
-msgid "Algorithms to Use"
-msgstr "Algorithms to Use"
-
-#. 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:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 213
-#: rc.cpp:792
-#, no-c-format
-msgid "Fuzzy sentence archive"
-msgstr "Fuzzy sentence archive"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 221
-#: rc.cpp:795
-#, no-c-format
-msgid "Glossary"
-msgstr "Glossary"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 229
-#: rc.cpp:798
-#, no-c-format
-msgid "Exact "
-msgstr "Exact "
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 252
-#: rc.cpp:801
-#, no-c-format
-msgid "Sentence by sentence"
-msgstr "Sentence by sentence"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 260
-#: rc.cpp:804
-#, no-c-format
-msgid "Alphanumeric"
-msgstr "Alphanumeric"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 313
-#: rc.cpp:822
-#, no-c-format
-msgid "Word by word"
-msgstr "Word by word"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 321
-#: rc.cpp:825
-#, no-c-format
-msgid "Dynamic dictionary"
-msgstr "Dynamic dictionary"
-
-#. 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:"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 356
-#: rc.cpp:831
-#, no-c-format
-msgid "Output"
-msgstr "Output"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 367
-#: rc.cpp:834
-#, no-c-format
-msgid "Output Processing"
-msgstr "Output Processing"
-
-#. 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"
-
-#. 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"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 411
-#: rc.cpp:843
-#, no-c-format
-msgid "Accelerator symbol (&&)"
-msgstr "Accelerator symbol (&&)"
-
-#. 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"
-
-#. 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"
+"The name you chose is already used.\n"
+"Please change the source name."
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 38
-#: kbabeldict/kbabeldictbox.cpp:208 rc.cpp:1234
-#, no-c-format
-msgid "Current:"
-msgstr "Current:"
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:563
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:615
+msgid "Name is Not Unique"
+msgstr "Name is Not Unique"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 59
-#: rc.cpp:1237
-#, no-c-format
-msgid "Overall:"
-msgstr "Overall:"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1412
+#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:67
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:68
+msgid "Translation Database"
+msgstr "Translation Database"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 80
-#: rc.cpp:1240
-#, no-c-format
-msgid "Current file:"
-msgstr "Current file:"
+#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:69
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:70
+msgid "A fast translation search engine based on databases"
+msgstr "A fast translation search engine based on databases"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 88
-#: rc.cpp:1243
-#, no-c-format
-msgid "Validation:"
-msgstr "Validation:"
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:72
+msgid "Copyright 2000-2003 by Andrea Rizzi"
+msgstr "Copyright 2000-2003 by Andrea Rizzi"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 32
-#: rc.cpp:1249
-#, no-c-format
-msgid "Mark invalid as &fuzzy"
-msgstr "Mark invalid as &fuzzy"
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:182
+msgid "CHUNK BY CHUNK"
+msgstr "CHUNK BY CHUNK"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 39
-#: rc.cpp:1252
-#, no-c-format
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:183
 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>"
+"<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 ""
-"<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>"
+"<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>"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 47
-#: rc.cpp:1259
-#, no-c-format
-msgid "&Do not validate fuzzy"
-msgstr "&Do not validate fuzzy"
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:374
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:386
+msgid "DYNAMIC DICT:"
+msgstr "DYNAMIC DICT:"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 52
-#: rc.cpp:1262
-#, no-c-format
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:375
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:387
 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>"
+"<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 ""
-"<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/aboutmoduledlg.cpp:42
-msgid "Report Bug..."
-msgstr "Report Bug..."
+"<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/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/dbsearchengine/KDBSearchEngine.cpp:258
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Create"
+msgstr "Create"
 
-#: kbabeldict/kbabeldictview.cpp:108
-msgid "Sea&rch in translations"
-msgstr "Sea&rch in translations"
+#: 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/kbabeldictview.cpp:125
-msgid "Settings:"
-msgstr "Settings:"
+#: kbabeldict/modules/pocompendium/pc_factory.cpp:95
+#: kbabeldict/modules/pocompendium/pocompendium.cpp:184
+msgid "PO Compendium"
+msgstr "PO Compendium"
 
-#: kbabeldict/modules/tmx/pc_factory.cpp:95
-#: kbabeldict/modules/tmx/tmxcompendium.cpp:175
-msgid "TMX Compendium"
-msgstr "TMX 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:79
 #: kbabeldict/modules/pocompendium/pocompendium.cpp:1195
@@ -4767,17 +4880,33 @@ msgstr "TMX Compendium"
 msgid "Loading PO compendium"
 msgstr "Loading PO compendium"
 
-#: kbabeldict/modules/tmx/preferenceswidget.cpp:88
+#: 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/compendiumdata.cpp:104
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:132
+msgid "Building indices"
+msgstr "Building indices"
+
+#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:88
 msgid ""
 "<qt>"
 "<p><b>Parameters</b></p>"
-"<p>Here you can fine-tune searching within the PO file. For example, if you "
-"want to perform a case sensitive search.</p></qt>"
+"<p>Here you can fine-tune searching within the PO file. For example if you want "
+"to perform a case sensitive search, or if you want fuzzy messages to be "
+"ignored.</p></qt>"
 msgstr ""
 "<qt>"
 "<p><b>Parameters</b></p>"
-"<p>Here you can fine-tune searching within the PO file. For example, if you "
-"want to perform a case sensitive search.</p></qt>"
+"<p>Here you can fine-tune searching within the PO file. For example if you want "
+"to perform a case sensitive search, or if you want fuzzy messages to be "
+"ignored.</p></qt>"
 
 #: kbabeldict/modules/pocompendium/preferenceswidget.cpp:96
 #: kbabeldict/modules/tmx/preferenceswidget.cpp:94
@@ -4816,6 +4945,53 @@ msgstr ""
 "<p><b>Location</b></p>"
 "<p>Configure here which file is to be used for searching.</p></qt>"
 
+#: 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/poauxiliary/poauxiliary.cpp:438
+#, c-format
+msgid ""
+"Error while trying to open file for PO Auxiliary module:\n"
+"%1"
+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"
+
+#: 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/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/tmx/preferenceswidget.cpp:88
+msgid ""
+"<qt>"
+"<p><b>Parameters</b></p>"
+"<p>Here you can fine-tune searching within the PO file. For example, if you "
+"want to perform a case sensitive search.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>Parameters</b></p>"
+"<p>Here you can fine-tune searching within the PO file. For example, if you "
+"want to perform a case sensitive search.</p></qt>"
+
 #: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:80
 msgid "Loading TMX compendium"
 msgstr "Loading TMX compendium"
@@ -4843,102 +5019,14 @@ msgstr ""
 "%1\n"
 "Reason: %2"
 
-#: kbabeldict/modules/pocompendium/compendiumdata.cpp:104
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:132
-msgid "Building indices"
-msgstr "Building indices"
-
 #: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:229
 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/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 ""
-"<qt>"
-"<p><b>Parameters</b></p>"
-"<p>Here you can fine-tune searching within the PO file. For example if you want "
-"to perform a case sensitive search, or if you want fuzzy messages to be "
-"ignored.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>Parameters</b></p>"
-"<p>Here you can fine-tune searching within the PO file. For example if you want "
-"to perform a case sensitive search, or if you want fuzzy messages to be "
-"ignored.</p></qt>"
-
-#: 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 open file for PO Auxiliary module:\n"
-"%1"
-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"
-
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1412
-#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:67
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:68
-msgid "Translation Database"
-msgstr "Translation Database"
-
-#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:69
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:70
-msgid "A fast translation search engine based on databases"
-msgstr "A fast translation search engine based on databases"
-
 #: 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
-msgid "Scanning file: %1"
-msgstr "Scanning file: %1"
-
-#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:107
-#, c-format
-msgid "Entries added: %1"
-msgstr "Entries added: %1"
-
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:84
 msgid "No error"
 msgstr "No error"
@@ -4957,12 +5045,6 @@ 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"
@@ -5013,11 +5095,6 @@ 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"
@@ -5096,77 +5173,15 @@ msgstr "Searching words"
 msgid "Process output"
 msgstr "Process output"
 
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:72
-msgid "Copyright 2000-2003 by Andrea Rizzi"
-msgstr "Copyright 2000-2003 by Andrea Rizzi"
-
-#: 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/dbsearchengine2/database.cpp:142
-msgid "Create Database"
-msgstr "Create Database"
-
-#: 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/kbabeldict.cpp:45
-msgid "KBabelDict"
-msgstr "KBabelDict"
-
-#: kbabeldict/kbabeldict.cpp:47
-msgid "About Module"
-msgstr "About Module"
-
-#: kbabeldict/kbabeldict.cpp:48 kbabeldict/kbabeldict.cpp:104
-msgid "Hide Sett&ings"
-msgstr "Hide Sett&ings"
+#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:102
+#, c-format
+msgid "Scanning file: %1"
+msgstr "Scanning file: %1"
 
-#: kbabeldict/kbabeldict.cpp:108
-msgid "Show Sett&ings"
-msgstr "Show Sett&ings"
+#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:107
+#, c-format
+msgid "Entries added: %1"
+msgstr "Entries added: %1"
 
 #: kbabeldict/kbabeldictbox.cpp:201
 msgid "Total:"
@@ -5266,41 +5281,31 @@ msgstr ""
 "The \"Translation Database\" module\n"
 "appears not to be installed on your system."
 
-#: kbabeldict/dictchooser.cpp:59
-msgid ""
-"_: dictionary to not use\n"
-"Do not use:"
-msgstr "Do not use:"
-
-#: kbabeldict/dictchooser.cpp:62
-msgid ""
-"_: dictionary to use\n"
-"Use:"
-msgstr "Use:"
-
-#: kbabeldict/dictchooser.cpp:84
-msgid "Move &Up"
-msgstr "Move &Up"
+#: common/kbmailer.cpp:106
+#, c-format
+msgid "Error while trying to download file %1."
+msgstr "Error while trying to download file %1."
 
-#: kbabeldict/dictchooser.cpp:87
-msgid "Move &Down"
-msgstr "Move &Down"
+#: common/kbmailer.cpp:145
+msgid "Enter the name of the archive without file extension"
+msgstr "Enter the name of the archive without file extension"
 
-#: kbabeldict/dictchooser.cpp:90
-msgid "Con&figure..."
-msgstr "Con&figure..."
+#: common/kbmailer.cpp:178
+msgid "Error while trying to create archive file."
+msgstr "Error while trying to create archive file."
 
-#: kbabeldict/main.cpp:114
-msgid "KBabel - Dictionary"
-msgstr "KBabel - Dictionary"
+#: common/kbmailer.cpp:193
+#, c-format
+msgid "Error while trying to read file %1."
+msgstr "Error while trying to read file %1."
 
-#: kbabeldict/main.cpp:115
-msgid "A dictionary for translators"
-msgstr "A dictionary for translators"
+#: common/kbmailer.cpp:208
+msgid "Error while trying to copy file %1 into archive."
+msgstr "Error while trying to copy file %1 into archive."
 
-#: kbabeldict/main.cpp:116
-msgid "(c) 2000,2001,2002,2003 The KBabeldict developers"
-msgstr "(c) 2000,2001,2002,2003 The KBabeldict developers"
+#: common/kbproject.cpp:53
+msgid "unnamed"
+msgstr "unnamed"
 
 #: common/catalog.cpp:592
 msgid ""
@@ -5326,39 +5331,329 @@ msgstr "searching matching message"
 msgid "preparing messages for diff"
 msgstr "preparing messages for diff"
 
-#: common/kbproject.cpp:53
-msgid "unnamed"
-msgstr "unnamed"
+#: addons/tdefile-plugins/tdefile_po.cpp:50
+msgid "Catalog Information"
+msgstr "Catalogue Information"
 
-#: common/kbmailer.cpp:106
-#, c-format
-msgid "Error while trying to download file %1."
-msgstr "Error while trying to download file %1."
+#: addons/tdefile-plugins/tdefile_po.cpp:53
+msgid "Total Messages"
+msgstr "Total Messages"
 
-#: common/kbmailer.cpp:145
-msgid "Enter the name of the archive without file extension"
-msgstr "Enter the name of the archive without file extension"
+#: addons/tdefile-plugins/tdefile_po.cpp:54
+msgid "Fuzzy Messages"
+msgstr "Fuzzy Messages"
 
-#: common/kbmailer.cpp:178
-msgid "Error while trying to create archive file."
-msgstr "Error while trying to create archive file."
+#: addons/tdefile-plugins/tdefile_po.cpp:55
+msgid "Untranslated Messages"
+msgstr "Untranslated Messages"
 
-#: common/kbmailer.cpp:193
+#: 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"
+
+#: catalogmanager/catalogmanager.cpp:222
+#: catalogmanager/validateprogress.cpp:72
+msgid "&Open"
+msgstr "&Open"
+
+#: 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 "Error while trying to read file %1."
-msgstr "Error while trying to read file %1."
+msgid "Cannot open project file %1"
+msgstr "Cannot open project 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."
+#: catalogmanager/main.cpp:186
+msgid "KBabel - Catalog Manager"
+msgstr "KBabel - Catalogue Manager"
 
-#: filters/gettext/gettextexport.cpp:74
-msgid "saving file"
-msgstr "saving file"
+#: catalogmanager/main.cpp:187
+msgid "An advanced catalog manager for KBabel"
+msgstr "An advanced catalogue manager for KBabel"
 
-#: filters/gettext/gettextimport.cpp:83
-msgid "loading file"
-msgstr "loading file"
+#: 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"
 
 #: catalogmanager/validateprogress.cpp:56
 msgid ""
@@ -5366,11 +5661,6 @@ msgid ""
 "Validation"
 msgstr "Validation"
 
-#: catalogmanager/catalogmanager.cpp:222
-#: catalogmanager/validateprogress.cpp:72
-msgid "&Open"
-msgstr "&Open"
-
 #: catalogmanager/validateprogress.cpp:73
 msgid "&Ignore"
 msgstr "&Ignore"
@@ -5407,57 +5697,57 @@ msgstr ""
 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/findinfilesdialog.cpp:50
+msgid "File Options"
+msgstr "File Options"
 
-#: catalogmanager/future.cpp:11
-msgid "Revert for Marked"
-msgstr "Revert for Marked"
+#: catalogmanager/findinfilesdialog.cpp:53
+msgid "&In all files"
+msgstr "&In all files"
 
-#: catalogmanager/future.cpp:12
-msgid "Cleanup"
-msgstr "Cleanup"
+#: catalogmanager/findinfilesdialog.cpp:54
+msgid "&Marked files"
+msgstr "&Marked files"
 
-#: catalogmanager/future.cpp:13
-msgid "Cleanup for Marked"
-msgstr "Cleanup for Marked"
+#: catalogmanager/findinfilesdialog.cpp:55
+msgid "In &templates"
+msgstr "In &templates"
 
-#: catalogmanager/future.cpp:16
-msgid "No repository"
-msgstr "No repository"
+#: catalogmanager/findinfilesdialog.cpp:56
+msgid "Ask before ne&xt file"
+msgstr "Ask before ne&xt file"
 
-#: catalogmanager/catmanlistitem.cpp:80
-msgid "Message Catalogs"
-msgstr "Message Catalogues"
+#: catalogmanager/findinfilesdialog.cpp:57
+msgid "Save &without asking"
+msgstr "Save &without asking"
 
-#: catalogmanager/catmanlistitem.cpp:450 catalogmanager/catmanlistitem.cpp:637
-msgid "No version control"
-msgstr "No version control"
+#: 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/libcvs/cvshandler.cpp:88
-msgid "No CVS repository"
-msgstr "No CVS repository"
+#: catalogmanager/libsvn/svnhandler.cpp:90
+msgid "No SVN repository"
+msgstr "No SVN repository"
 
-#: catalogmanager/libcvs/cvshandler.cpp:91
-msgid "Not in CVS"
-msgstr "Not in CVS"
+#: catalogmanager/libsvn/svnhandler.cpp:93
+msgid "Not in SVN"
+msgstr "Not in SVN"
 
 #: catalogmanager/libcvs/cvshandler.cpp:94
 #: catalogmanager/libsvn/svnhandler.cpp:96
@@ -5484,17 +5774,20 @@ msgstr "Up-to-date"
 msgid "Conflict"
 msgstr "Conflict"
 
+#: catalogmanager/libsvn/svnhandler.cpp:111
+msgid "Error in Working Copy"
+msgstr "Error in Working Copy"
+
 #: catalogmanager/libcvs/cvshandler.cpp:109
 #: catalogmanager/libsvn/svnhandler.cpp:113
 msgid "Unknown"
 msgstr "Unknown"
 
-#: catalogmanager/libcvs/cvshandler.cpp:189
-#: catalogmanager/libcvs/cvshandler.cpp:228
+#: catalogmanager/libsvn/svnhandler.cpp:288
 msgid ""
-"This is not a valid CVS repository. The CVS commands cannot be executed."
+"This is not a valid SVN repository. The SVN commands cannot be executed."
 msgstr ""
-"This is not a valid CVS repository. The CVS commands cannot be executed."
+"This is not a valid SVN repository. The SVN commands cannot be executed."
 
 #: catalogmanager/libcvs/cvsdialog.cpp:311
 #: catalogmanager/libcvs/cvshandler.cpp:375
@@ -5503,9 +5796,9 @@ msgstr ""
 msgid "[ Starting command ]"
 msgstr "[ Starting command ]"
 
-#: catalogmanager/libcvs/cvsdialog.cpp:68
-msgid "CVS Dialog"
-msgstr "CVS Dialogue"
+#: catalogmanager/libsvn/svndialog.cpp:65
+msgid "SVN Dialog"
+msgstr "SVN Dialogue"
 
 #: catalogmanager/libcvs/cvsdialog.cpp:77
 #: catalogmanager/libsvn/svndialog.cpp:74
@@ -5517,15 +5810,23 @@ msgstr "Update the following files:"
 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/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/libcvs/cvsdialog.cpp:86
 #: catalogmanager/libsvn/svndialog.cpp:86
 msgid "Get diff for the following files:"
 msgstr "Get diff for the following files:"
 
+#: catalogmanager/libsvn/svndialog.cpp:89
+msgid "Get information for the following files:"
+msgstr "Get information for the following files:"
+
 #: catalogmanager/libcvs/cvsdialog.cpp:100
 #: catalogmanager/libsvn/svndialog.cpp:103
 msgid "&Old messages:"
@@ -5536,22 +5837,6 @@ msgstr "&Old messages:"
 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"
@@ -5572,6 +5857,10 @@ msgstr "&Get Status"
 msgid "&Get Diff"
 msgstr "&Get Diff"
 
+#: catalogmanager/libsvn/svndialog.cpp:145
+msgid "&Get Information"
+msgstr "&Get Information"
+
 #: catalogmanager/libcvs/cvsdialog.cpp:165
 #: catalogmanager/libsvn/svndialog.cpp:160
 msgid "Command output:"
@@ -5582,19 +5871,6 @@ msgstr "Command output:"
 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."
@@ -5620,11 +5896,49 @@ msgstr "[ Exited with status %1 ]"
 msgid "[ Finished ]"
 msgstr "[ Finished ]"
 
-#: catalogmanager/libcvs/cvsdialog.cpp:401
-msgid ""
-"_: Descriptive encoding name\n"
-"Last choice ( %1 )"
-msgstr "Last choice (%1)"
+#: 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/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/multiroughtransdlg.cpp:56
+msgid "Files:"
+msgstr "Files:"
 
 #: catalogmanager/catalogmanagerview.cpp:89
 msgid "Name"
@@ -5925,393 +6239,79 @@ msgstr "Reading file information"
 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/libcvs/cvshandler.cpp:88
+msgid "No CVS repository"
+msgstr "No CVS repository"
 
-#: catalogmanager/findinfilesdialog.cpp:57
-msgid "Save &without asking"
-msgstr "Save &without asking"
+#: catalogmanager/libcvs/cvshandler.cpp:91
+msgid "Not in CVS"
+msgstr "Not in CVS"
 
-#: catalogmanager/findinfilesdialog.cpp:59
+#: catalogmanager/libcvs/cvshandler.cpp:189
+#: catalogmanager/libcvs/cvshandler.cpp:228
 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>"
+"This is not a valid CVS repository. The CVS commands cannot be executed."
 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>"
+"This is not a valid CVS repository. The CVS commands cannot be executed."
 
-#: catalogmanager/libsvn/svnhandler.cpp:90
-msgid "No SVN repository"
-msgstr "No SVN repository"
+#: catalogmanager/libcvs/cvsdialog.cpp:68
+msgid "CVS Dialog"
+msgstr "CVS Dialogue"
 
-#: catalogmanager/libsvn/svnhandler.cpp:93
-msgid "Not in SVN"
-msgstr "Not in SVN"
+#: catalogmanager/libcvs/cvsdialog.cpp:83
+msgid "Get status for the following files:"
+msgstr "Get status for the following files:"
 
-#: catalogmanager/libsvn/svnhandler.cpp:111
-msgid "Error in Working Copy"
-msgstr "Error in Working Copy"
+#: catalogmanager/libcvs/cvsdialog.cpp:114
+msgid "E&ncoding:"
+msgstr "E&ncoding:"
 
-#: catalogmanager/libsvn/svnhandler.cpp:288
+#: catalogmanager/libcvs/cvsdialog.cpp:121
 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"
+"_: Descriptive encoding name\n"
+"Recommended ( %1 )"
+msgstr "Recommended (%1)"
 
-#: catalogmanager/catalogmanager.cpp:558
+#: catalogmanager/libcvs/cvsdialog.cpp:122
 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>"
+"_: Descriptive encoding name\n"
+"Locale ( %1 )"
+msgstr "Locale (%1)"
 
-#: 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/libcvs/cvsdialog.cpp:247
+#, c-format
+msgid "Cannot find encoding: %1"
+msgstr "Cannot find encoding: %1"
 
-#: catalogmanager/catalogmanager.cpp:858
+#: catalogmanager/libcvs/cvsdialog.cpp:253
 msgid ""
-"Unable to use TDELauncher to start KBabel.\n"
-"You should check the installation of TDE.\n"
-"Please start KBabel manually."
+"The commit log message cannot be encoded in the selected encoding: %1.\n"
+"Do you want to continue?"
 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!"
+"The commit log message cannot be encoded in the selected encoding: %1.\n"
+"Do you want to continue?"
 
-#: catalogmanager/catalogmanager.cpp:1235
-#, c-format
-msgid "Cannot open project file %1"
-msgstr "Cannot open project file %1"
+#: catalogmanager/libcvs/cvsdialog.cpp:401
+msgid ""
+"_: Descriptive encoding name\n"
+"Last choice ( %1 )"
+msgstr "Last choice (%1)"
 
-#: catalogmanager/main.cpp:186
-msgid "KBabel - Catalog Manager"
-msgstr "KBabel - Catalogue Manager"
+#: catalogmanager/markpatterndialog.cpp:113
+msgid "Ma&rk files which match the following pattern:"
+msgstr "Ma&rk files which match the following pattern:"
 
-#: catalogmanager/main.cpp:187
-msgid "An advanced catalog manager for KBabel"
-msgstr "An advanced catalogue manager for KBabel"
+#: catalogmanager/markpatterndialog.cpp:114
+msgid "&Mark Files"
+msgstr "&Mark Files"
 
-#: catalogmanager/main.cpp:211
-msgid "Support for making diffs and some minor improvements."
-msgstr "Support for making diffs and some minor improvements."
+#: catalogmanager/markpatterndialog.cpp:116
+msgid "Unma&rk files which match the following pattern:"
+msgstr "Unma&rk files which match the following pattern:"
 
-#: catalogmanager/main.cpp:216
-msgid "KBabel contains code from GNU gettext"
-msgstr "KBabel contains code from GNU gettext"
+#: catalogmanager/markpatterndialog.cpp:117
+msgid "Un&mark Files"
+msgstr "Un&mark Files"
 
 #~ msgid ""
 #~ "\n"
diff --git a/tde-i18n-en_GB/messages/tdesdk/kbugbuster.po b/tde-i18n-en_GB/messages/tdesdk/kbugbuster.po
index 67b6274bf90..45d3dcfe9b3 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kbugbuster.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kbugbuster.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbugbuster\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
diff --git a/tde-i18n-en_GB/messages/tdesdk/kompare.po b/tde-i18n-en_GB/messages/tdesdk/kompare.po
index ad1bd4db145..ca75936eb70 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kompare.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kompare.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kompare\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
@@ -17,109 +17,6 @@ msgstr ""
 "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"
@@ -212,168 +109,6 @@ msgstr "The files are identical."
 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
@@ -500,229 +235,346 @@ msgstr "Side-by-side"
 msgid "Number of context lines:"
 msgstr "Number of context lines:"
 
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "Preferences"
+#: main.cpp:33
+msgid ""
+"A program to view the differences between files and optionally generate a diff"
+msgstr ""
+"A program to view the differences between files and optionally generate a diff"
 
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "View Settings"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr "This will compare URL1 with URL2"
 
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Diff Settings"
+#: main.cpp:40
+msgid ""
+"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and "
+"then it will read from standard input. Can be used for instance for cvs diff | "
+"kompare -o -. Kompare will do a check to see if it can find the original "
+"file(s) and then blend the original file(s) into the diffoutput and show that "
+"in the viewer. -n disables the check."
+msgstr ""
+"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and "
+"then it will read from standard input. Can be used for instance for cvs diff | "
+"kompare -o -. Kompare will do a check to see if it can find the original "
+"file(s) and then blend the original file(s) into the diffoutput and show that "
+"in the viewer. -n disables the check."
 
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "Save &All"
+#: main.cpp:41
+msgid ""
+"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the "
+"file or folder that the diffoutput needs to be blended into. "
+msgstr ""
+"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the "
+"file or folder that the diffoutput needs to be blended into. "
 
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "Save .&diff..."
+#: main.cpp:42
+msgid ""
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
+msgstr ""
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
 
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "Swap Source with Destination"
+#: main.cpp:43
+msgid ""
+"Use this to specify the encoding when calling it from the command line. It will "
+"default to the local encoding if not specified."
+msgstr ""
+"Use this to specify the encoding when calling it from the command line. It will "
+"default to the local encoding if not specified."
 
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "Show Statistics"
+#: main.cpp:52
+msgid "Kompare"
+msgstr "Kompare"
 
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+#: main.cpp:54
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+msgstr "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
 
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "Author"
 
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Diff Options"
+#: main.cpp:57
+msgid "Kompare icon artist"
+msgstr "Kompare icon artist"
 
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|Patch Files"
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "A lot of good advice"
 
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "Save .diff"
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "Cervisia diff viewer"
 
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
-msgstr "The file exists or is write-protected; do you want to overwrite it?"
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "Compare Files or Folders"
 
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "File Exists"
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Source"
 
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "Overwrite"
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Destination"
 
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "Do Not Overwrite"
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "Compare"
 
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
-msgstr "KomparePart"
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "Compare these files or folder"
 
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "Running diff..."
+#: 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. "
 
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "Parsing diff output..."
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "John Knight"
 
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "Comparing file %1 with file %2"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "anarchist_tomato@herzeleid.net"
 
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "Comparing files in %1 with files in %2"
+#: kompare_shell.cpp:77
+msgid "Could not find our KompareViewPart."
+msgstr "Could not find our KompareViewPart."
 
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "Viewing diff output from %1"
+#: kompare_shell.cpp:106
+msgid "Could not load our KompareViewPart."
+msgstr "Could not load our KompareViewPart."
 
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "Blending diff output from %1 into file %2"
+#: kompare_shell.cpp:114
+msgid "Could not find our KompareNavigationPart."
+msgstr "Could not find our KompareNavigationPart."
 
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
-msgstr "Blending diff output from %1 into folder %2"
+#: kompare_shell.cpp:138
+msgid "Could not load our KompareNavigationPart."
+msgstr "Could not load our KompareNavigationPart."
 
-#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+#: 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 ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
+"_n:  %1 of %n file \n"
+" %1 of %n files "
 msgstr ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
-
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "Save Changes?"
+" %1 of %n file \n"
+" %1 of %n files "
 
-#: komparepart/kompare_part.cpp:667
+#: kompare_shell.cpp:275
+#, c-format
 msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+"_n:  %n file \n"
+" %n files "
 msgstr ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
+" %n file \n"
+" %n files "
 
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Diff Statistics"
+#: 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 "
 
-#: komparepart/kompare_part.cpp:673
+#: kompare_shell.cpp:281
+#, c-format
 msgid ""
-"Statistics:\n"
-"\n"
-"Old file: %1\n"
-"New file: %2\n"
-"\n"
-"Format: %3\n"
-"Number of hunks: %4\n"
-"Number of differences: %5"
+"_n:  %n difference \n"
+" %n differences "
 msgstr ""
-"Statistics:\n"
-"\n"
-"Old file: %1\n"
-"New file: %2\n"
-"\n"
-"Format: %3\n"
-"Number of hunks: %4\n"
-"Number of differences: %5"
+" %n difference \n"
+" %n differences "
 
-#: komparepart/kompare_part.cpp:686
+#: 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 ""
-"Statistics:\n"
-"\n"
-"Number of files in diff file: %1\n"
-"Format: %2\n"
-"\n"
-"Current old file: %3\n"
-"Current new file: %4\n"
-"\n"
-"Number of hunks: %5\n"
-"Number of differences: %6"
+"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 ""
-"Statistics:\n"
-"\n"
-"Number of files in diff file: %1\n"
-"Format: %2\n"
-"\n"
-"Current old file: %3\n"
-"Current new file: %4\n"
-"\n"
-"Number of hunks: %5\n"
-"Number of differences: %6"
+"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. "
 
-#: libdialogpages/filespage.cpp:53
-msgid "Encoding"
-msgstr "Encoding"
+#: kompare_shell.cpp:402
+msgid "Compare these files or folders"
+msgstr "Compare these files or folders"
 
-#: libdialogpages/filespage.cpp:64
-msgid "&Files"
-msgstr "&Files"
+#: kompare_shell.cpp:439
+msgid "Text View"
+msgstr "Text View"
 
-#: libdialogpages/viewpage.cpp:51
-msgid "Colors"
-msgstr "Colours"
+#: komparenavtreepart/komparenavtreepart.cpp:61
+msgid "Source Folder"
+msgstr "Source Folder"
 
-#: libdialogpages/viewpage.cpp:56
-msgid "Removed color:"
-msgstr "Removed colour:"
+#: komparenavtreepart/komparenavtreepart.cpp:66
+msgid "Destination Folder"
+msgstr "Destination Folder"
 
-#: libdialogpages/viewpage.cpp:61
-msgid "Changed color:"
-msgstr "Changed colour:"
+#: komparenavtreepart/komparenavtreepart.cpp:71
+msgid "Source File"
+msgstr "Source File"
 
-#: libdialogpages/viewpage.cpp:66
-msgid "Added color:"
-msgstr "Added colour:"
+#: komparenavtreepart/komparenavtreepart.cpp:72
+msgid "Destination File"
+msgstr "Destination File"
 
-#: libdialogpages/viewpage.cpp:71
-msgid "Applied color:"
-msgstr "Applied colour:"
+#: komparenavtreepart/komparenavtreepart.cpp:78
+msgid "Source Line"
+msgstr "Source Line"
 
-#: libdialogpages/viewpage.cpp:76
-msgid "Mouse Wheel"
-msgstr "Mouse Wheel"
+#: komparenavtreepart/komparenavtreepart.cpp:79
+msgid "Destination Line"
+msgstr "Destination Line"
 
-#: libdialogpages/viewpage.cpp:80
-msgid "Number of lines:"
-msgstr "Number of lines:"
+#: komparenavtreepart/komparenavtreepart.cpp:80
+msgid "Difference"
+msgstr "Difference"
 
-#: libdialogpages/viewpage.cpp:86
-msgid "Tabs to Spaces"
-msgstr "Tabs to Spaces"
+#: 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"
 
-#: libdialogpages/viewpage.cpp:90
-msgid "Number of spaces to convert a tab character to:"
-msgstr "Number of spaces to convert a tab character to:"
+#: komparenavtreepart/komparenavtreepart.cpp:429
+#, c-format
+msgid ""
+"_n: Changed %n line\n"
+"Changed %n lines"
+msgstr ""
+"Changed %n line\n"
+"Changed %n lines"
 
-#: libdialogpages/viewpage.cpp:97
-msgid "A&ppearance"
-msgstr "A&ppearance"
+#: 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"
 
-#: libdialogpages/viewpage.cpp:104
-msgid "Text Font"
-msgstr "Text Font"
+#: komparenavtreepart/komparenavtreepart.cpp:437
+#, c-format
+msgid ""
+"_n: Inserted %n line\n"
+"Inserted %n lines"
+msgstr ""
+"Inserted %n line\n"
+"Inserted %n lines"
 
-#: libdialogpages/viewpage.cpp:108
-msgid "Font:"
-msgstr "Font:"
+#: 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"
 
-#: libdialogpages/viewpage.cpp:112
-msgid "Size:"
-msgstr "Size:"
+#: 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"
+
+#: 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."
 
 #: libdialogpages/diffpage.cpp:211
 msgid "Diff Program"
@@ -928,78 +780,226 @@ msgstr ""
 msgid "&Exclude"
 msgstr "&Exclude"
 
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr ""
-"A program to view the differences between files and optionally generate a diff"
+#: libdialogpages/filespage.cpp:53
+msgid "Encoding"
+msgstr "Encoding"
 
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr "This will compare URL1 with URL2"
+#: libdialogpages/filespage.cpp:64
+msgid "&Files"
+msgstr "&Files"
 
-#: main.cpp:40
+#: libdialogpages/viewpage.cpp:51
+msgid "Colors"
+msgstr "Colours"
+
+#: libdialogpages/viewpage.cpp:56
+msgid "Removed color:"
+msgstr "Removed colour:"
+
+#: libdialogpages/viewpage.cpp:61
+msgid "Changed color:"
+msgstr "Changed colour:"
+
+#: libdialogpages/viewpage.cpp:66
+msgid "Added color:"
+msgstr "Added colour:"
+
+#: libdialogpages/viewpage.cpp:71
+msgid "Applied color:"
+msgstr "Applied colour:"
+
+#: libdialogpages/viewpage.cpp:76
+msgid "Mouse Wheel"
+msgstr "Mouse Wheel"
+
+#: libdialogpages/viewpage.cpp:80
+msgid "Number of lines:"
+msgstr "Number of lines:"
+
+#: libdialogpages/viewpage.cpp:86
+msgid "Tabs to Spaces"
+msgstr "Tabs to Spaces"
+
+#: libdialogpages/viewpage.cpp:90
+msgid "Number of spaces to convert a tab character to:"
+msgstr "Number of spaces to convert a tab character to:"
+
+#: libdialogpages/viewpage.cpp:97
+msgid "A&ppearance"
+msgstr "A&ppearance"
+
+#: libdialogpages/viewpage.cpp:104
+msgid "Text Font"
+msgstr "Text Font"
+
+#: libdialogpages/viewpage.cpp:108
+msgid "Font:"
+msgstr "Font:"
+
+#: libdialogpages/viewpage.cpp:112
+msgid "Size:"
+msgstr "Size:"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "Preferences"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "View Settings"
+
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Diff Settings"
+
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "Save &All"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "Save .&diff..."
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "Swap Source with Destination"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "Show Statistics"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Diff Options"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|Patch Files"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "Save .diff"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr "The file exists or is write-protected; do you want to overwrite it?"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "File Exists"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "Do Not Overwrite"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "Running diff..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "Parsing diff output..."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "Comparing file %1 with file %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "Comparing files in %1 with files in %2"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "Viewing diff output from %1"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "Blending diff output from %1 into file %2"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "Blending diff output from %1 into folder %2"
+
+#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
 msgid ""
-"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and "
-"then it will read from standard input. Can be used for instance for cvs diff | "
-"kompare -o -. Kompare will do a check to see if it can find the original "
-"file(s) and then blend the original file(s) into the diffoutput and show that "
-"in the viewer. -n disables the check."
+"You have made changes to the destination file(s).\n"
+"Would you like to save them?"
 msgstr ""
-"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and "
-"then it will read from standard input. Can be used for instance for cvs diff | "
-"kompare -o -. Kompare will do a check to see if it can find the original "
-"file(s) and then blend the original file(s) into the diffoutput and show that "
-"in the viewer. -n disables the check."
+"You have made changes to the destination file(s).\n"
+"Would you like to save them?"
 
-#: main.cpp:41
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "Save Changes?"
+
+#: komparepart/kompare_part.cpp:667
 msgid ""
-"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the "
-"file or folder that the diffoutput needs to be blended into. "
+"No diff file, or no 2 files have been diffed. Therefore no stats are available."
 msgstr ""
-"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the "
-"file or folder that the diffoutput needs to be blended into. "
+"No diff file, or no 2 files have been diffed. Therefore no stats are available."
 
-#: main.cpp:42
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Diff Statistics"
+
+#: komparepart/kompare_part.cpp:673
 msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
+"Statistics:\n"
+"\n"
+"Old file: %1\n"
+"New file: %2\n"
+"\n"
+"Format: %3\n"
+"Number of hunks: %4\n"
+"Number of differences: %5"
 msgstr ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
+"Statistics:\n"
+"\n"
+"Old file: %1\n"
+"New file: %2\n"
+"\n"
+"Format: %3\n"
+"Number of hunks: %4\n"
+"Number of differences: %5"
 
-#: main.cpp:43
+#: komparepart/kompare_part.cpp:686
 msgid ""
-"Use this to specify the encoding when calling it from the command line. It will "
-"default to the local encoding if not specified."
+"Statistics:\n"
+"\n"
+"Number of files in diff file: %1\n"
+"Format: %2\n"
+"\n"
+"Current old file: %3\n"
+"Current new file: %4\n"
+"\n"
+"Number of hunks: %5\n"
+"Number of differences: %6"
 msgstr ""
-"Use this to specify the encoding when calling it from the command line. It will "
-"default to the local encoding if not specified."
-
-#: main.cpp:52
-msgid "Kompare"
-msgstr "Kompare"
-
-#: main.cpp:54
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "Author"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr "Kompare icon artist"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "A lot of good advice"
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "Cervisia diff viewer"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "Compare these files or folder"
+"Statistics:\n"
+"\n"
+"Number of files in diff file: %1\n"
+"Format: %2\n"
+"\n"
+"Current old file: %3\n"
+"Current new file: %4\n"
+"\n"
+"Number of hunks: %5\n"
+"Number of differences: %6"
diff --git a/tde-i18n-en_GB/messages/tdesdk/kres_bugzilla.po b/tde-i18n-en_GB/messages/tdesdk/kres_bugzilla.po
index 23e2cb8388f..b07d9b719df 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kres_bugzilla.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kres_bugzilla.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_bugzilla\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
diff --git a/tde-i18n-en_GB/messages/tdesdk/kstartperf.po b/tde-i18n-en_GB/messages/tdesdk/kstartperf.po
index b26926c46c9..3f4544935eb 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kstartperf.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kstartperf.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kstartperf\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
diff --git a/tde-i18n-en_GB/messages/tdesdk/kuiviewer.po b/tde-i18n-en_GB/messages/tdesdk/kuiviewer.po
index 88d5e96154f..8f37b1c1a25 100644
--- a/tde-i18n-en_GB/messages/tdesdk/kuiviewer.po
+++ b/tde-i18n-en_GB/messages/tdesdk/kuiviewer.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kuiviewer\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
diff --git a/tde-i18n-en_GB/messages/tdesdk/spy.po b/tde-i18n-en_GB/messages/tdesdk/spy.po
index 9cdcc2f620e..1794c295a1b 100644
--- a/tde-i18n-en_GB/messages/tdesdk/spy.po
+++ b/tde-i18n-en_GB/messages/tdesdk/spy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: spy\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
@@ -15,17 +15,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: receiversview.cpp:36
-msgid "Object"
-msgstr "Object"
+#: classinfoview.cpp:30 navview.cpp:28 propsview.cpp:53
+msgid "Name"
+msgstr "Name"
+
+#: classinfoview.cpp:31 propsview.cpp:54
+msgid "Value"
+msgstr "Value"
 
 #: navview.cpp:29 propsview.cpp:55 receiversview.cpp:37
 msgid "Type"
 msgstr "Type"
 
-#: receiversview.cpp:38
-msgid "Member Name"
-msgstr "Member Name"
+#: propsview.cpp:56
+msgid "Access"
+msgstr "Access"
+
+#: propsview.cpp:57
+msgid "Designable"
+msgstr "Designable"
+
+#: propsview.cpp:58
+msgid "Type Flags"
+msgstr "Type Flags"
+
+#: main.cpp:25 main.cpp:38
+msgid "Spy"
+msgstr "Spy"
 
 #: _translatorinfo.cpp:1
 msgid ""
@@ -39,6 +55,10 @@ msgid ""
 "Your emails"
 msgstr "malcolm.hunter@gmx.co.uk"
 
+#: sigslotview.cpp:30
+msgid "Signals/Slots"
+msgstr "Signals/Slots"
+
 #: spy.cpp:67
 msgid "Signals && Slots"
 msgstr "Signals && Slots"
@@ -51,30 +71,10 @@ 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"
-
-#: propsview.cpp:57
-msgid "Designable"
-msgstr "Designable"
-
-#: propsview.cpp:58
-msgid "Type Flags"
-msgstr "Type Flags"
-
-#: main.cpp:25 main.cpp:38
-msgid "Spy"
-msgstr "Spy"
+#: receiversview.cpp:36
+msgid "Object"
+msgstr "Object"
 
-#: sigslotview.cpp:30
-msgid "Signals/Slots"
-msgstr "Signals/Slots"
+#: receiversview.cpp:38
+msgid "Member Name"
+msgstr "Member Name"
diff --git a/tde-i18n-en_GB/messages/tdesdk/tdecachegrind.po b/tde-i18n-en_GB/messages/tdesdk/tdecachegrind.po
index 4e178fbf10b..53cde339456 100644
--- a/tde-i18n-en_GB/messages/tdesdk/tdecachegrind.po
+++ b/tde-i18n-en_GB/messages/tdesdk/tdecachegrind.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdecachegrind\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
@@ -17,27 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _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"
-
-#: 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"
-
 #: tabview.cpp:64
 msgid "Move to Top"
 msgstr "Move to Top"
@@ -175,6 +154,706 @@ msgstr "(No Data loaded)"
 msgid "(No function selected)"
 msgstr "(No function selected)"
 
+#: 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 tdecachegrindui.rc line 15
+#: rc.cpp:9
+#, no-c-format
+msgid "&Layout"
+msgstr "&Layout"
+
+#. i18n: file tdecachegrindui.rc line 32
+#: rc.cpp:12
+#, no-c-format
+msgid "Sidebars"
+msgstr "Sidebars"
+
+#. i18n: file tdecachegrindui.rc line 54
+#: rc.cpp:18
+#, no-c-format
+msgid "State Toolbar"
+msgstr "State Toolbar"
+
+#. i18n: file configdlgbase.ui line 37
+#: rc.cpp:24
+#, no-c-format
+msgid "General"
+msgstr "General"
+
+#. i18n: file configdlgbase.ui line 69
+#: rc.cpp:27
+#, no-c-format
+msgid "Truncated when more/longer than:"
+msgstr "Truncated when more/longer than:"
+
+#. i18n: file configdlgbase.ui line 77
+#: rc.cpp:30
+#, no-c-format
+msgid "Precision of percentage values:"
+msgstr "Precision of percentage values:"
+
+#. i18n: file configdlgbase.ui line 85
+#: rc.cpp:33
+#, no-c-format
+msgid "Symbols in tooltips and context menus"
+msgstr "Symbols in tooltips and context menus"
+
+#. i18n: file configdlgbase.ui line 141
+#: rc.cpp:36
+#, no-c-format
+msgid "Maximum number of items in lists:"
+msgstr "Maximum number of items in lists:"
+
+#. i18n: file configdlgbase.ui line 162
+#: rc.cpp:39
+#, no-c-format
+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
+msgid "Object:"
+msgstr "Object:"
+
+#. i18n: file configdlgbase.ui line 262
+#: rc.cpp:48
+#, no-c-format
+msgid "Class:"
+msgstr "Class:"
+
+#. i18n: file configdlgbase.ui line 310
+#: rc.cpp:57
+#, no-c-format
+msgid "File:"
+msgstr "File:"
+
+#. i18n: file configdlgbase.ui line 376
+#: rc.cpp:60
+#, no-c-format
+msgid "Annotations"
+msgstr "Annotations"
+
+#. i18n: file configdlgbase.ui line 395
+#: rc.cpp:63
+#, no-c-format
+msgid "Context lines in annotations:"
+msgstr "Context lines in annotations:"
+
+#. i18n: file configdlgbase.ui line 423
+#: rc.cpp:66
+#, no-c-format
+msgid "Source Folders"
+msgstr "Source Folders"
+
+#. i18n: file configdlgbase.ui line 454
+#: rc.cpp:69
+#, no-c-format
+msgid "Object / Related Source Base"
+msgstr "Object / Related Source Base"
+
+#. i18n: file configdlgbase.ui line 483
+#: rc.cpp:72
+#, no-c-format
+msgid "Add..."
+msgstr "Add..."
+
+#. i18n: file dumpselectionbase.ui line 16
+#: rc.cpp:84 toplevel.cpp:352 toplevel.cpp:604
+#, no-c-format
+msgid "Profile Dumps"
+msgstr "Profile Dumps"
+
+#. i18n: file dumpselectionbase.ui line 32
+#: rc.cpp:87
+#, no-c-format
+msgid "Target"
+msgstr "Target"
+
+#. i18n: file dumpselectionbase.ui line 54
+#: rc.cpp:90
+#, no-c-format
+msgid "Time"
+msgstr "Time"
+
+#. i18n: file dumpselectionbase.ui line 65
+#: rc.cpp:93
+#, no-c-format
+msgid "Path"
+msgstr "Path"
+
+#. i18n: file dumpselectionbase.ui line 106
+#: rc.cpp:99
+#, no-c-format
+msgid "Target command:"
+msgstr "Target command:"
+
+#. i18n: file dumpselectionbase.ui line 119
+#: rc.cpp:102
+#, no-c-format
+msgid "Profiler options:"
+msgstr "Profiler options:"
+
+#. i18n: file dumpselectionbase.ui line 125
+#: rc.cpp:105
+#, no-c-format
+msgid "Option"
+msgstr "Option"
+
+#. i18n: file dumpselectionbase.ui line 136
+#: rc.cpp:108 rc.cpp:219
+#, no-c-format
+msgid "Value"
+msgstr "Value"
+
+#. i18n: file dumpselectionbase.ui line 147
+#: rc.cpp:111
+#, no-c-format
+msgid "Trace"
+msgstr "Trace"
+
+#. i18n: file dumpselectionbase.ui line 160
+#: rc.cpp:114 rc.cpp:237
+#, no-c-format
+msgid "Jumps"
+msgstr "Jumps"
+
+#. i18n: file dumpselectionbase.ui line 174
+#: rc.cpp:117
+#, no-c-format
+msgid "Instructions"
+msgstr "Instructions"
+
+#. i18n: file dumpselectionbase.ui line 189
+#: rc.cpp:120 rc.cpp:240
+#, no-c-format
+msgid "Events"
+msgstr "Events"
+
+#. i18n: file dumpselectionbase.ui line 202
+#: rc.cpp:123
+#, no-c-format
+msgid "Full Cache"
+msgstr "Full Cache"
+
+#. i18n: file dumpselectionbase.ui line 216
+#: rc.cpp:126
+#, no-c-format
+msgid "Custom"
+msgstr "Custom"
+
+#. i18n: file dumpselectionbase.ui line 231
+#: rc.cpp:129
+#, no-c-format
+msgid "Collect"
+msgstr "Collect"
+
+#. i18n: file dumpselectionbase.ui line 244
+#: rc.cpp:132
+#, no-c-format
+msgid "At Startup"
+msgstr "At Startup"
+
+#. i18n: file dumpselectionbase.ui line 258
+#: rc.cpp:135
+#, no-c-format
+msgid "While In"
+msgstr "While In"
+
+#. i18n: file dumpselectionbase.ui line 273
+#: rc.cpp:138
+#, no-c-format
+msgid "Skip"
+msgstr "Skip"
+
+#. i18n: file dumpselectionbase.ui line 286
+#: rc.cpp:141
+#, no-c-format
+msgid "PLT"
+msgstr "PLT"
+
+#. i18n: file dumpselectionbase.ui line 315
+#: rc.cpp:147
+#, no-c-format
+msgid "Dump Profile"
+msgstr "Dump Profile"
+
+#. i18n: file dumpselectionbase.ui line 328
+#: rc.cpp:150
+#, no-c-format
+msgid "Every BBs"
+msgstr "Every BBs"
+
+#. i18n: file dumpselectionbase.ui line 342
+#: rc.cpp:153 rc.cpp:162
+#, no-c-format
+msgid "On Entering"
+msgstr "On Entering"
+
+#. i18n: file dumpselectionbase.ui line 356
+#: rc.cpp:156
+#, no-c-format
+msgid "On Leaving"
+msgstr "On Leaving"
+
+#. i18n: file dumpselectionbase.ui line 371
+#: rc.cpp:159
+#, no-c-format
+msgid "Zero Events"
+msgstr "Zero Events"
+
+#. i18n: file dumpselectionbase.ui line 399
+#: rc.cpp:165
+#, no-c-format
+msgid "Separate"
+msgstr "Separate"
+
+#. i18n: file dumpselectionbase.ui line 412
+#: rc.cpp:168
+#, no-c-format
+msgid "Threads"
+msgstr "Threads"
+
+#. i18n: file dumpselectionbase.ui line 426
+#: rc.cpp:171
+#, no-c-format
+msgid "Recursions"
+msgstr "Recursions"
+
+#. i18n: file dumpselectionbase.ui line 440
+#: rc.cpp:174
+#, no-c-format
+msgid "Call Chain"
+msgstr "Call Chain"
+
+#. i18n: file dumpselectionbase.ui line 470
+#: rc.cpp:177
+#, no-c-format
+msgid "Custom profiler options:"
+msgstr "Custom profiler options:"
+
+#. i18n: file dumpselectionbase.ui line 508
+#: rc.cpp:180
+#, no-c-format
+msgid "Run New Profile"
+msgstr "Run New Profile"
+
+#. i18n: file dumpselectionbase.ui line 520
+#: rc.cpp:183
+#, no-c-format
+msgid "Info"
+msgstr "Info"
+
+#. i18n: file dumpselectionbase.ui line 531
+#: rc.cpp:186
+#, no-c-format
+msgid "Dump reason:"
+msgstr "Dump reason:"
+
+#. i18n: file dumpselectionbase.ui line 544
+#: rc.cpp:189
+#, no-c-format
+msgid "Event summary:"
+msgstr "Event summary:"
+
+#. i18n: file dumpselectionbase.ui line 550
+#: callmapview.cpp:59 partselection.cpp:58 rc.cpp:192
+#, no-c-format
+msgid "Name"
+msgstr "Name"
+
+#. i18n: file dumpselectionbase.ui line 561
+#: rc.cpp:195
+#, no-c-format
+msgid "Sum"
+msgstr "Sum"
+
+#. i18n: file dumpselectionbase.ui line 579
+#: rc.cpp:198
+#, no-c-format
+msgid "Miscellaneous:"
+msgstr "Miscellaneous:"
+
+#. i18n: file dumpselectionbase.ui line 617
+#: rc.cpp:201
+#, no-c-format
+msgid "Show"
+msgstr "Show"
+
+#. i18n: file dumpselectionbase.ui line 625
+#: rc.cpp:204
+#, no-c-format
+msgid "Compare"
+msgstr "Compare"
+
+#. i18n: file dumpselectionbase.ui line 637
+#: rc.cpp:207
+#, no-c-format
+msgid "State"
+msgstr "State"
+
+#. i18n: file dumpselectionbase.ui line 656
+#: rc.cpp:210
+#, no-c-format
+msgid "Update"
+msgstr "Update"
+
+#. i18n: file dumpselectionbase.ui line 664
+#: rc.cpp:213
+#, no-c-format
+msgid "Every [s]:"
+msgstr "Every [s]:"
+
+#. i18n: file dumpselectionbase.ui line 677
+#: rc.cpp:216
+#, no-c-format
+msgid "Counter"
+msgstr "Counter"
+
+#. i18n: file dumpselectionbase.ui line 699
+#: rc.cpp:222
+#, no-c-format
+msgid "Dumps Done"
+msgstr "Dumps Done"
+
+#. i18n: file dumpselectionbase.ui line 713
+#: rc.cpp:225
+#, no-c-format
+msgid "Is Collecting"
+msgstr "Is Collecting"
+
+#. i18n: file dumpselectionbase.ui line 727
+#: rc.cpp:228
+#, no-c-format
+msgid "Executed"
+msgstr "Executed"
+
+#. i18n: file dumpselectionbase.ui line 740
+#: rc.cpp:231
+#, no-c-format
+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
+msgid "Ir"
+msgstr "Ir"
+
+#. i18n: file dumpselectionbase.ui line 811
+#: rc.cpp:246
+#, no-c-format
+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
+msgid "Functions"
+msgstr "Functions"
+
+#. i18n: file dumpselectionbase.ui line 852
+#: rc.cpp:255
+#, no-c-format
+msgid "Contexts"
+msgstr "Contexts"
+
+#. i18n: file dumpselectionbase.ui line 890
+#: rc.cpp:258
+#, no-c-format
+msgid "Stack trace:"
+msgstr "Stack trace:"
+
+#. i18n: file dumpselectionbase.ui line 898
+#: rc.cpp:261
+#, no-c-format
+msgid "Sync."
+msgstr "Sync."
+
+#. i18n: file dumpselectionbase.ui line 906
+#: instrview.cpp:125 rc.cpp:264 sourceview.cpp:50
+#, no-c-format
+msgid "#"
+msgstr "No."
+
+#. i18n: file dumpselectionbase.ui line 917
+#: costtypeview.cpp:43 coverageview.cpp:46 partview.cpp:47 rc.cpp:267
+#: rc.cpp:309
+#, no-c-format
+msgid "Incl."
+msgstr "Incl."
+
+#. 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"
+
+#. 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
+msgid "Start"
+msgstr "Start"
+
+#. i18n: file dumpselectionbase.ui line 1001
+#: rc.cpp:282
+#, no-c-format
+msgid "Zero"
+msgstr "Zero"
+
+#. i18n: file dumpselectionbase.ui line 1009
+#: rc.cpp:285
+#, no-c-format
+msgid "Dump"
+msgstr "Dump"
+
+#. i18n: file dumpselectionbase.ui line 1021
+#: rc.cpp:288
+#, no-c-format
+msgid "Messages"
+msgstr "Messages"
+
+#. i18n: file dumpselectionbase.ui line 1045
+#: rc.cpp:291
+#, no-c-format
+msgid "Kill Run"
+msgstr "Kill Run"
+
+#. i18n: file functionselectionbase.ui line 16
+#: rc.cpp:297 toplevel.cpp:594
+#, no-c-format
+msgid "Function Profile"
+msgstr "Function Profile"
+
+#. i18n: file functionselectionbase.ui line 41
+#: rc.cpp:300
+#, no-c-format
+msgid "&Search:"
+msgstr "&Search:"
+
+#. i18n: file functionselectionbase.ui line 62
+#: costtypeview.cpp:44 coverageview.cpp:53 partview.cpp:48 rc.cpp:303
+#: rc.cpp:312
+#, no-c-format
+msgid "Self"
+msgstr "Self"
+
+#. i18n: file functionselectionbase.ui line 73
+#: rc.cpp:306
+#, no-c-format
+msgid "Group"
+msgstr "Group"
+
+#. i18n: file partselectionbase.ui line 16
+#: rc.cpp:324 toplevel.cpp:276 toplevel.cpp:576
+#, no-c-format
+msgid "Parts Overview"
+msgstr "Parts Overview"
+
+#. i18n: file partselectionbase.ui line 60
+#: rc.cpp:327
+#, no-c-format
+msgid "(no trace parts)"
+msgstr "(no trace parts)"
+
+#. i18n: file stackselectionbase.ui line 16
+#: rc.cpp:330
+#, no-c-format
+msgid "Stack Selection"
+msgstr "Stack Selection"
+
+#. i18n: file stackselectionbase.ui line 31
+#: callmapview.cpp:60 callview.cpp:44 instrview.cpp:126 partselection.cpp:59
+#: rc.cpp:333 sourceview.cpp:51
+#, no-c-format
+msgid "Cost"
+msgstr "Cost"
+
+#. i18n: file stackselectionbase.ui line 42
+#: rc.cpp:336
+#, no-c-format
+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)"
+
 #: tips.txt:3
 msgid ""
 "<p>...that the <em>What's This?</em> help for every GUI widget\n"
@@ -363,156 +1042,59 @@ msgstr ""
 "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"
+#: main.cpp:38
+msgid "Run <exec> under cachegrind"
+msgstr "Run <exec> under cachegrind"
 
-#: configdlg.cpp:60
-msgid "Source Files"
-msgstr "Source Files"
+#: main.cpp:39
+msgid "Show information of this trace"
+msgstr "Show information of this trace"
 
-#: configdlg.cpp:61
-msgid "C++ Classes"
-msgstr "C++ Classes"
+#: main.cpp:46
+msgid "KCachegrind"
+msgstr "KCachegrind"
 
-#: configdlg.cpp:62
-msgid "Function (no Grouping)"
-msgstr "Function (no Grouping)"
+#: main.cpp:48
+msgid "TDE Frontend for Cachegrind"
+msgstr "TDE Frontend for Cachegrind"
 
-#: configdlg.cpp:157 configdlg.cpp:350 configdlg.cpp:371
-msgid "(always)"
-msgstr "(always)"
+#: main.cpp:50
+msgid "(C) 2002, 2003, 2004"
+msgstr "(C) 2002, 2003, 2004"
 
-#: configdlg.cpp:210
-msgid "KCachegrind Configuration"
-msgstr "KCachegrind Configuration"
+#: main.cpp:53
+msgid "Author/Maintainer"
+msgstr "Author/Maintainer"
 
-#: configdlg.cpp:211
+#: coverageitem.cpp:65 coverageitem.cpp:205 functionitem.cpp:72
+#, c-format
 msgid ""
-"The Maximum Number of List Items should be below 500.The previous set value "
-"(%1) will still be used."
+"_n: (%n function skipped)\n"
+"(%n functions skipped)"
 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
-#, no-c-format
-msgid "Name"
-msgstr "Name"
-
-#. i18n: file stackselectionbase.ui line 31
-#: callmapview.cpp:60 callview.cpp:44 instrview.cpp:126 partselection.cpp:59
-#: rc.cpp:333 sourceview.cpp:51
-#, no-c-format
-msgid "Cost"
-msgstr "Cost"
-
-#: partselection.cpp:151
-msgid "Profile Part Overview: Current is '%1'"
-msgstr "Profile Part Overview: Current is '%1'"
-
-#: partselection.cpp:287
-msgid "Deselect"
-msgstr "Deselect"
-
-#: partselection.cpp:287 partselection.cpp:311
-msgid "Select"
-msgstr "Select"
-
-#: partselection.cpp:292
-msgid "Select All Parts"
-msgstr "Select All Parts"
-
-#: partselection.cpp:294
-msgid "Visible Parts"
-msgstr "Visible Parts"
-
-#: partselection.cpp:296
-msgid "Hide Selected Parts"
-msgstr "Hide Selected Parts"
-
-#: partselection.cpp:297
-msgid "Unhide Hidden Parts"
-msgstr "Unhide Hidden Parts"
-
-#: partselection.cpp:302 toplevel.cpp:1687
-msgid "Go Back"
-msgstr "Go Back"
-
-#: callgraphview.cpp:2570 partselection.cpp:320
-msgid "Visualization"
-msgstr "Visualisation"
-
-#: partselection.cpp:322
-msgid "Partitioning Mode"
-msgstr "Partitioning Mode"
-
-#: partselection.cpp:323
-msgid "Diagram Mode"
-msgstr "Diagram Mode"
-
-#: partselection.cpp:324
-msgid "Zoom Function"
-msgstr "Zoom Function"
-
-#: partselection.cpp:325
-msgid "Show Direct Calls"
-msgstr "Show Direct Calls"
-
-#: partselection.cpp:326
-msgid "Increment Shown Call Levels"
-msgstr "Increment Shown Call Levels"
-
-#: partselection.cpp:340
-msgid "Draw Names"
-msgstr "Draw Names"
-
-#: partselection.cpp:341
-msgid "Draw Costs"
-msgstr "Draw Costs"
-
-#: callmapview.cpp:303 partselection.cpp:342
-msgid "Ignore Proportions"
-msgstr "Ignore Proportions"
-
-#: partselection.cpp:343
-msgid "Draw Frames"
-msgstr "Draw Frames"
-
-#: callmapview.cpp:304 partselection.cpp:344 treemap.cpp:2887
-msgid "Allow Rotation"
-msgstr "Allow Rotation"
-
-#: partselection.cpp:359
-msgid "Hide Info"
-msgstr "Hide Info"
-
-#: partselection.cpp:361
-msgid "Show Info"
-msgstr "Show Info"
+"(%n function skipped)\n"
+"(%n functions skipped)"
 
-#: partselection.cpp:541
-msgid "(no trace loaded)"
-msgstr "(no trace loaded)"
+#: costlistitem.cpp:60
+#, c-format
+msgid ""
+"_n: (%n item skipped)\n"
+"(%n items skipped)"
+msgstr ""
+"(%n item skipped)\n"
+"(%n items skipped)"
 
-#. i18n: file dumpselectionbase.ui line 950
-#: callmapview.cpp:61 rc.cpp:276 rc.cpp:321
-#, no-c-format
-msgid "Location"
-msgstr "Location"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Jonathan Riddell"
 
-#. i18n: file dumpselectionbase.ui line 754
-#: callmapview.cpp:63 rc.cpp:234 rc.cpp:339
-#, no-c-format
-msgid "Calls"
-msgstr "Calls"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kde-en-gb@jriddell.org"
 
 #: callmapview.cpp:98
 msgid ""
@@ -694,6 +1276,14 @@ msgstr "Draw Location"
 msgid "Draw Calls"
 msgstr "Draw Calls"
 
+#: callmapview.cpp:303 partselection.cpp:342
+msgid "Ignore Proportions"
+msgstr "Ignore Proportions"
+
+#: callmapview.cpp:304 partselection.cpp:344 treemap.cpp:2887
+msgid "Allow Rotation"
+msgstr "Allow Rotation"
+
 #: callmapview.cpp:321 treemap.cpp:2889
 msgid "Shading"
 msgstr "Shading"
@@ -710,123 +1300,89 @@ msgstr "(no function)"
 msgid "(no call)"
 msgstr "(no call)"
 
-#. i18n: file dumpselectionbase.ui line 917
-#: costtypeview.cpp:43 coverageview.cpp:46 partview.cpp:47 rc.cpp:267
-#: rc.cpp:309
-#, no-c-format
-msgid "Incl."
-msgstr "Incl."
+#: instritem.cpp:106 sourceitem.cpp:86
+msgid "Active call to '%1'"
+msgstr "Active call to '%1'"
 
-#: coverageview.cpp:48 coverageview.cpp:54
-msgid "Distance"
-msgstr "Distance"
+#: 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'"
 
-#. 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"
+#: sourceitem.cpp:125
+msgid "Jump %1 of %2 times to %3"
+msgstr "Jump %1 of %2 times to %3"
 
-#: callview.cpp:48 coverageview.cpp:50
-msgid "Caller"
-msgstr "Caller"
+#: sourceitem.cpp:130
+msgid "Jump %1 times to %2"
+msgstr "Jump %1 times to %2"
 
-#. i18n: file functionselectionbase.ui line 62
-#: costtypeview.cpp:44 coverageview.cpp:53 partview.cpp:48 rc.cpp:303
-#: rc.cpp:312
-#, no-c-format
-msgid "Self"
-msgstr "Self"
+#: instritem.cpp:185 sourceitem.cpp:169
+msgid "(cycle)"
+msgstr "(cycle)"
 
-#: coverageview.cpp:55
-msgid "Calling"
-msgstr "Calling"
+#: costtypeview.cpp:42
+msgid "Event Type"
+msgstr "Event Type"
 
-#: callview.cpp:52 coverageview.cpp:56
-msgid "Callee"
-msgstr "Callee"
+#: costtypeview.cpp:45
+msgid "Short"
+msgstr "Short"
 
-#: 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>"
+#: costtypeview.cpp:47
+msgid "Formula"
+msgstr "Formula"
 
-#: coverageview.cpp:120
+#: costtypeview.cpp:81
 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>"
+"<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 ""
-"<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>"
+"<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: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:98
+msgid "Set Secondary Event Type"
+msgstr "Set Secondary Event Type"
+
+#: costtypeview.cpp:100
+msgid "Remove Secondary Event Type"
+msgstr "Remove Secondary Event Type"
+
+#: costtypeview.cpp:105
+msgid "Edit Long Name"
+msgstr "Edit Long Name"
+
+#: costtypeview.cpp:106
+msgid "Edit Short Name"
+msgstr "Edit Short Name"
+
+#: costtypeview.cpp:107
+msgid "Edit Formula"
+msgstr "Edit Formula"
+
+#: costtypeview.cpp:115
+msgid "New Cost Type ..."
+msgstr "New Cost Type ..."
+
+#: costtypeview.cpp:149 costtypeview.cpp:154
+#, c-format
+msgid "New%1"
+msgstr "New%1"
+
+#: costtypeview.cpp:155
+#, c-format
+msgid "New Cost Type %1"
+msgstr "New Cost Type %1"
 
 #: callview.cpp:45 instrview.cpp:127 sourceview.cpp:52
 msgid "Cost 2"
@@ -836,6 +1392,14 @@ msgstr "Cost 2"
 msgid "Count"
 msgstr "Count"
 
+#: callview.cpp:48 coverageview.cpp:50
+msgid "Caller"
+msgstr "Caller"
+
+#: callview.cpp:52 coverageview.cpp:56
+msgid "Callee"
+msgstr "Callee"
+
 #: callview.cpp:85
 msgid ""
 "<b>List of direct Callers</b>"
@@ -876,179 +1440,20 @@ msgstr ""
 "panel. If there are two panels (Split mode), the function of the other panel is "
 "changed instead.</p>"
 
-#: instritem.cpp:106 sourceitem.cpp:86
-msgid "Active call to '%1'"
-msgstr "Active call to '%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'"
-
-#: instritem.cpp:137
-msgid "Jump %1 of %2 times to 0x%3"
-msgstr "Jump %1 of %2 times to 0x%3"
-
-#: instritem.cpp:142
-msgid "Jump %1 times to 0x%2"
-msgstr "Jump %1 times to 0x%2"
-
-#: instritem.cpp:185 sourceitem.cpp:169
-msgid "(cycle)"
-msgstr "(cycle)"
-
-#: 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)"
+#: 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'"
 
-#: tracedata.cpp:5017
-msgid "Recalculating Function Cycles..."
-msgstr "Recalculating Function Cycles..."
+#: cachegrindloader.cpp:141
+msgid "Import filter for Cachegrind/Callgrind generated profile data files"
+msgstr "Import filter for Cachegrind/Callgrind generated profile data files"
 
-#. i18n: file partselectionbase.ui line 16
-#: rc.cpp:324 toplevel.cpp:276 toplevel.cpp:576
-#, no-c-format
-msgid "Parts Overview"
-msgstr "Parts Overview"
+#: cachegrindloader.cpp:738
+#, c-format
+msgid "Loading %1"
+msgstr "Loading %1"
 
 #: toplevel.cpp:283
 msgid ""
@@ -1130,12 +1535,6 @@ msgstr ""
 "'Function' group type), ordered by the costs spent therein. Functions with "
 "costs less than 1% are hidden on default.</p>"
 
-#. i18n: file dumpselectionbase.ui line 16
-#: rc.cpp:84 toplevel.cpp:352 toplevel.cpp:604
-#, no-c-format
-msgid "Profile Dumps"
-msgstr "Profile Dumps"
-
 #: toplevel.cpp:362
 msgid ""
 "<b>Profile Dumps</b>"
@@ -1334,12 +1733,6 @@ msgstr "Call Stack"
 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:594
-#, no-c-format
-msgid "Function Profile"
-msgstr "Function Profile"
-
 #: toplevel.cpp:599
 msgid "Show/Hide the Function Profile Dockable"
 msgstr "Show/Hide the Function Profile Dockable"
@@ -1560,6 +1953,10 @@ msgstr "Show Absolute Cost"
 msgid "Show Relative Cost"
 msgstr "Show Relative Cost"
 
+#: partselection.cpp:302 toplevel.cpp:1687
+msgid "Go Back"
+msgstr "Go Back"
+
 #: toplevel.cpp:1688
 msgid "Go Forward"
 msgstr "Go Forward"
@@ -1601,92 +1998,22 @@ msgstr "(No previous function)"
 msgid "(No Function Up)"
 msgstr "(No Function Up)"
 
-#: costlistitem.cpp:60
-#, c-format
-msgid ""
-"_n: (%n item skipped)\n"
-"(%n items skipped)"
-msgstr ""
-"(%n item skipped)\n"
-"(%n items skipped)"
-
-#: sourceitem.cpp:125
-msgid "Jump %1 of %2 times to %3"
-msgstr "Jump %1 of %2 times to %3"
-
-#: sourceitem.cpp:130
-msgid "Jump %1 times to %2"
-msgstr "Jump %1 times to %2"
-
-#: costtypeview.cpp:42
-msgid "Event Type"
-msgstr "Event Type"
-
-#: costtypeview.cpp:45
-msgid "Short"
-msgstr "Short"
-
-#: costtypeview.cpp:47
-msgid "Formula"
-msgstr "Formula"
-
-#: costtypeview.cpp:81
-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>"
-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>"
-
-#: costtypeview.cpp:98
-msgid "Set Secondary Event Type"
-msgstr "Set Secondary Event Type"
-
-#: costtypeview.cpp:100
-msgid "Remove Secondary Event Type"
-msgstr "Remove Secondary Event Type"
-
-#: costtypeview.cpp:105
-msgid "Edit Long Name"
-msgstr "Edit Long Name"
-
-#: costtypeview.cpp:106
-msgid "Edit Short Name"
-msgstr "Edit Short Name"
-
-#: costtypeview.cpp:107
-msgid "Edit Formula"
-msgstr "Edit Formula"
-
-#: costtypeview.cpp:115
-msgid "New Cost Type ..."
-msgstr "New Cost Type ..."
-
-#: costtypeview.cpp:149 costtypeview.cpp:154
-#, c-format
-msgid "New%1"
-msgstr "New%1"
-
-#: costtypeview.cpp:155
-#, c-format
-msgid "New Cost Type %1"
-msgstr "New Cost Type %1"
-
 #: costtypeitem.cpp:56
 msgid "Unknown Type"
 msgstr "Unknown Type"
 
-#. i18n: file dumpselectionbase.ui line 906
-#: instrview.cpp:125 rc.cpp:264 sourceview.cpp:50
-#, no-c-format
-msgid "#"
-msgstr "No."
+#: functionselection.cpp:176
+#, c-format
+msgid "Go to %1"
+msgstr "Go to %1"
+
+#: functionselection.cpp:203
+msgid "Show All Items"
+msgstr "Show All Items"
+
+#: functionselection.cpp:226
+msgid "No Grouping"
+msgstr "No Grouping"
 
 #: sourceview.cpp:54 sourceview.cpp:554
 msgid "Source (unknown)"
@@ -1773,500 +2100,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."
 
-#: functionselection.cpp:176
-#, c-format
-msgid "Go to %1"
-msgstr "Go to %1"
-
-#: functionselection.cpp:203
-msgid "Show All Items"
-msgstr "Show All Items"
-
-#: functionselection.cpp:226
-msgid "No Grouping"
-msgstr "No Grouping"
-
-#. i18n: file tdecachegrindui.rc line 15
-#: rc.cpp:9
-#, no-c-format
-msgid "&Layout"
-msgstr "&Layout"
-
-#. i18n: file tdecachegrindui.rc line 32
-#: rc.cpp:12
-#, no-c-format
-msgid "Sidebars"
-msgstr "Sidebars"
-
-#. i18n: file tdecachegrindui.rc line 54
-#: rc.cpp:18
-#, no-c-format
-msgid "State Toolbar"
-msgstr "State Toolbar"
-
-#. i18n: file configdlgbase.ui line 37
-#: rc.cpp:24
-#, no-c-format
-msgid "General"
-msgstr "General"
-
-#. i18n: file configdlgbase.ui line 69
-#: rc.cpp:27
-#, no-c-format
-msgid "Truncated when more/longer than:"
-msgstr "Truncated when more/longer than:"
-
-#. i18n: file configdlgbase.ui line 77
-#: rc.cpp:30
-#, no-c-format
-msgid "Precision of percentage values:"
-msgstr "Precision of percentage values:"
-
-#. i18n: file configdlgbase.ui line 85
-#: rc.cpp:33
-#, no-c-format
-msgid "Symbols in tooltips and context menus"
-msgstr "Symbols in tooltips and context menus"
-
-#. i18n: file configdlgbase.ui line 141
-#: rc.cpp:36
-#, no-c-format
-msgid "Maximum number of items in lists:"
-msgstr "Maximum number of items in lists:"
-
-#. i18n: file configdlgbase.ui line 162
-#: rc.cpp:39
-#, no-c-format
-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
-msgid "Object:"
-msgstr "Object:"
-
-#. i18n: file configdlgbase.ui line 262
-#: rc.cpp:48
-#, no-c-format
-msgid "Class:"
-msgstr "Class:"
-
-#. i18n: file configdlgbase.ui line 310
-#: rc.cpp:57
-#, no-c-format
-msgid "File:"
-msgstr "File:"
-
-#. i18n: file configdlgbase.ui line 376
-#: rc.cpp:60
-#, no-c-format
-msgid "Annotations"
-msgstr "Annotations"
-
-#. i18n: file configdlgbase.ui line 395
-#: rc.cpp:63
-#, no-c-format
-msgid "Context lines in annotations:"
-msgstr "Context lines in annotations:"
-
-#. i18n: file configdlgbase.ui line 423
-#: rc.cpp:66
-#, no-c-format
-msgid "Source Folders"
-msgstr "Source Folders"
-
-#. i18n: file configdlgbase.ui line 454
-#: rc.cpp:69
-#, no-c-format
-msgid "Object / Related Source Base"
-msgstr "Object / Related Source Base"
-
-#. i18n: file configdlgbase.ui line 483
-#: rc.cpp:72
-#, no-c-format
-msgid "Add..."
-msgstr "Add..."
-
-#. i18n: file dumpselectionbase.ui line 32
-#: rc.cpp:87
-#, no-c-format
-msgid "Target"
-msgstr "Target"
-
-#. i18n: file dumpselectionbase.ui line 54
-#: rc.cpp:90
-#, no-c-format
-msgid "Time"
-msgstr "Time"
-
-#. i18n: file dumpselectionbase.ui line 65
-#: rc.cpp:93
-#, no-c-format
-msgid "Path"
-msgstr "Path"
-
-#. i18n: file dumpselectionbase.ui line 106
-#: rc.cpp:99
-#, no-c-format
-msgid "Target command:"
-msgstr "Target command:"
-
-#. i18n: file dumpselectionbase.ui line 119
-#: rc.cpp:102
-#, no-c-format
-msgid "Profiler options:"
-msgstr "Profiler options:"
-
-#. i18n: file dumpselectionbase.ui line 125
-#: rc.cpp:105
-#, no-c-format
-msgid "Option"
-msgstr "Option"
-
-#. i18n: file dumpselectionbase.ui line 136
-#: rc.cpp:108 rc.cpp:219
-#, no-c-format
-msgid "Value"
-msgstr "Value"
-
-#. i18n: file dumpselectionbase.ui line 147
-#: rc.cpp:111
-#, no-c-format
-msgid "Trace"
-msgstr "Trace"
-
-#. i18n: file dumpselectionbase.ui line 160
-#: rc.cpp:114 rc.cpp:237
-#, no-c-format
-msgid "Jumps"
-msgstr "Jumps"
-
-#. i18n: file dumpselectionbase.ui line 174
-#: rc.cpp:117
-#, no-c-format
-msgid "Instructions"
-msgstr "Instructions"
-
-#. i18n: file dumpselectionbase.ui line 189
-#: rc.cpp:120 rc.cpp:240
-#, no-c-format
-msgid "Events"
-msgstr "Events"
-
-#. i18n: file dumpselectionbase.ui line 202
-#: rc.cpp:123
-#, no-c-format
-msgid "Full Cache"
-msgstr "Full Cache"
-
-#. i18n: file dumpselectionbase.ui line 216
-#: rc.cpp:126
-#, no-c-format
-msgid "Custom"
-msgstr "Custom"
-
-#. i18n: file dumpselectionbase.ui line 231
-#: rc.cpp:129
-#, no-c-format
-msgid "Collect"
-msgstr "Collect"
-
-#. i18n: file dumpselectionbase.ui line 244
-#: rc.cpp:132
-#, no-c-format
-msgid "At Startup"
-msgstr "At Startup"
-
-#. i18n: file dumpselectionbase.ui line 258
-#: rc.cpp:135
-#, no-c-format
-msgid "While In"
-msgstr "While In"
-
-#. i18n: file dumpselectionbase.ui line 273
-#: rc.cpp:138
-#, no-c-format
-msgid "Skip"
-msgstr "Skip"
-
-#. i18n: file dumpselectionbase.ui line 286
-#: rc.cpp:141
-#, no-c-format
-msgid "PLT"
-msgstr "PLT"
-
-#. i18n: file dumpselectionbase.ui line 315
-#: rc.cpp:147
-#, no-c-format
-msgid "Dump Profile"
-msgstr "Dump Profile"
-
-#. i18n: file dumpselectionbase.ui line 328
-#: rc.cpp:150
-#, no-c-format
-msgid "Every BBs"
-msgstr "Every BBs"
-
-#. i18n: file dumpselectionbase.ui line 342
-#: rc.cpp:153 rc.cpp:162
-#, no-c-format
-msgid "On Entering"
-msgstr "On Entering"
-
-#. i18n: file dumpselectionbase.ui line 356
-#: rc.cpp:156
-#, no-c-format
-msgid "On Leaving"
-msgstr "On Leaving"
-
-#. i18n: file dumpselectionbase.ui line 371
-#: rc.cpp:159
-#, no-c-format
-msgid "Zero Events"
-msgstr "Zero Events"
-
-#. i18n: file dumpselectionbase.ui line 399
-#: rc.cpp:165
-#, no-c-format
-msgid "Separate"
-msgstr "Separate"
-
-#. i18n: file dumpselectionbase.ui line 412
-#: rc.cpp:168
-#, no-c-format
-msgid "Threads"
-msgstr "Threads"
-
-#. i18n: file dumpselectionbase.ui line 426
-#: rc.cpp:171
-#, no-c-format
-msgid "Recursions"
-msgstr "Recursions"
-
-#. i18n: file dumpselectionbase.ui line 440
-#: rc.cpp:174
-#, no-c-format
-msgid "Call Chain"
-msgstr "Call Chain"
-
-#. i18n: file dumpselectionbase.ui line 470
-#: rc.cpp:177
-#, no-c-format
-msgid "Custom profiler options:"
-msgstr "Custom profiler options:"
-
-#. i18n: file dumpselectionbase.ui line 508
-#: rc.cpp:180
-#, no-c-format
-msgid "Run New Profile"
-msgstr "Run New Profile"
-
-#. i18n: file dumpselectionbase.ui line 520
-#: rc.cpp:183
-#, no-c-format
-msgid "Info"
-msgstr "Info"
-
-#. i18n: file dumpselectionbase.ui line 531
-#: rc.cpp:186
-#, no-c-format
-msgid "Dump reason:"
-msgstr "Dump reason:"
-
-#. i18n: file dumpselectionbase.ui line 544
-#: rc.cpp:189
-#, no-c-format
-msgid "Event summary:"
-msgstr "Event summary:"
-
-#. i18n: file dumpselectionbase.ui line 561
-#: rc.cpp:195
-#, no-c-format
-msgid "Sum"
-msgstr "Sum"
-
-#. i18n: file dumpselectionbase.ui line 579
-#: rc.cpp:198
-#, no-c-format
-msgid "Miscellaneous:"
-msgstr "Miscellaneous:"
-
-#. i18n: file dumpselectionbase.ui line 617
-#: rc.cpp:201
-#, no-c-format
-msgid "Show"
-msgstr "Show"
-
-#. i18n: file dumpselectionbase.ui line 625
-#: rc.cpp:204
-#, no-c-format
-msgid "Compare"
-msgstr "Compare"
-
-#. i18n: file dumpselectionbase.ui line 637
-#: rc.cpp:207
-#, no-c-format
-msgid "State"
-msgstr "State"
-
-#. i18n: file dumpselectionbase.ui line 656
-#: rc.cpp:210
-#, no-c-format
-msgid "Update"
-msgstr "Update"
-
-#. i18n: file dumpselectionbase.ui line 664
-#: rc.cpp:213
-#, no-c-format
-msgid "Every [s]:"
-msgstr "Every [s]:"
-
-#. i18n: file dumpselectionbase.ui line 677
-#: rc.cpp:216
-#, no-c-format
-msgid "Counter"
-msgstr "Counter"
-
-#. i18n: file dumpselectionbase.ui line 699
-#: rc.cpp:222
-#, no-c-format
-msgid "Dumps Done"
-msgstr "Dumps Done"
-
-#. i18n: file dumpselectionbase.ui line 713
-#: rc.cpp:225
-#, no-c-format
-msgid "Is Collecting"
-msgstr "Is Collecting"
-
-#. i18n: file dumpselectionbase.ui line 727
-#: rc.cpp:228
-#, no-c-format
-msgid "Executed"
-msgstr "Executed"
-
-#. i18n: file dumpselectionbase.ui line 740
-#: rc.cpp:231
-#, no-c-format
-msgid "Basic Blocks"
-msgstr "Basic Blocks"
-
-#. i18n: file dumpselectionbase.ui line 796
-#: rc.cpp:243
-#, no-c-format
-msgid "Ir"
-msgstr "Ir"
-
-#. i18n: file dumpselectionbase.ui line 811
-#: rc.cpp:246
-#, no-c-format
-msgid "Distinct"
-msgstr "Distinct"
-
-#. i18n: file dumpselectionbase.ui line 838
-#: rc.cpp:252
-#, no-c-format
-msgid "Functions"
-msgstr "Functions"
-
-#. i18n: file dumpselectionbase.ui line 852
-#: rc.cpp:255
-#, no-c-format
-msgid "Contexts"
-msgstr "Contexts"
-
-#. i18n: file dumpselectionbase.ui line 890
-#: rc.cpp:258
-#, no-c-format
-msgid "Stack trace:"
-msgstr "Stack trace:"
-
-#. i18n: file dumpselectionbase.ui line 898
-#: rc.cpp:261
-#, no-c-format
-msgid "Sync."
-msgstr "Sync."
-
-#. i18n: file dumpselectionbase.ui line 976
-#: rc.cpp:279
-#, no-c-format
-msgid "Start"
-msgstr "Start"
-
-#. i18n: file dumpselectionbase.ui line 1001
-#: rc.cpp:282
-#, no-c-format
-msgid "Zero"
-msgstr "Zero"
-
-#. i18n: file dumpselectionbase.ui line 1009
-#: rc.cpp:285
-#, no-c-format
-msgid "Dump"
-msgstr "Dump"
-
-#. i18n: file dumpselectionbase.ui line 1021
-#: rc.cpp:288
-#, no-c-format
-msgid "Messages"
-msgstr "Messages"
-
-#. i18n: file dumpselectionbase.ui line 1045
-#: rc.cpp:291
-#, no-c-format
-msgid "Kill Run"
-msgstr "Kill Run"
-
-#. i18n: file functionselectionbase.ui line 41
-#: rc.cpp:300
-#, no-c-format
-msgid "&Search:"
-msgstr "&Search:"
-
-#. i18n: file functionselectionbase.ui line 73
-#: rc.cpp:306
-#, no-c-format
-msgid "Group"
-msgstr "Group"
-
-#. i18n: file partselectionbase.ui line 60
-#: rc.cpp:327
-#, no-c-format
-msgid "(no trace parts)"
-msgstr "(no trace parts)"
-
-#. i18n: file stackselectionbase.ui line 16
-#: rc.cpp:330
-#, no-c-format
-msgid "Stack Selection"
-msgstr "Stack Selection"
-
-#. i18n: file stackselectionbase.ui line 42
-#: rc.cpp:336
-#, no-c-format
-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"
@@ -2347,6 +2180,38 @@ msgstr "L1 Miss Sum"
 msgid "Cycle Estimation"
 msgstr "Cycle Estimation"
 
+#: 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"
+
 #: partview.cpp:51
 msgid "Comment"
 msgstr "Comment"
@@ -2401,19 +2266,6 @@ msgstr "Hide Selected"
 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"
@@ -2696,117 +2548,97 @@ msgstr "BottomRight"
 msgid "Graph"
 msgstr "Graph"
 
+#: callgraphview.cpp:2570 partselection.cpp:320
+msgid "Visualization"
+msgstr "Visualisation"
+
 #: callgraphview.cpp:2571
 msgid "Birds-eye View"
 msgstr "Birds-eye View"
 
-#: treemap.cpp:1281
-#, c-format
-msgid "Text %1"
-msgstr "Text %1"
-
-#: treemap.cpp:2809
-msgid "Recursive Bisection"
-msgstr "Recursive Bisection"
-
-#: treemap.cpp:2810
-msgid "Columns"
-msgstr "Columns"
-
-#: treemap.cpp:2811
-msgid "Rows"
-msgstr "Rows"
-
-#: treemap.cpp:2812
-msgid "Always Best"
-msgstr "Always Best"
+#: partlistitem.cpp:49
+msgid " (Thread %1)"
+msgstr " (Thread %1)"
 
-#: treemap.cpp:2813
-msgid "Best"
-msgstr "Best"
+#: partlistitem.cpp:56
+msgid "(none)"
+msgstr "(none)"
 
-#: treemap.cpp:2814
-msgid "Alternate (V)"
-msgstr "Alternate (V)"
+#: callitem.cpp:82 partlistitem.cpp:152
+msgid "(active)"
+msgstr "(active)"
 
-#: treemap.cpp:2815
-msgid "Alternate (H)"
-msgstr "Alternate (H)"
+#: partselection.cpp:151
+msgid "Profile Part Overview: Current is '%1'"
+msgstr "Profile Part Overview: Current is '%1'"
 
-#: treemap.cpp:2872
-msgid "Nesting"
-msgstr "Nesting"
+#: partselection.cpp:287
+msgid "Deselect"
+msgstr "Deselect"
 
-#: treemap.cpp:2875
-msgid "Correct Borders Only"
-msgstr "Correct Borders Only"
+#: partselection.cpp:287 partselection.cpp:311
+msgid "Select"
+msgstr "Select"
 
-#: treemap.cpp:2877 treemap.cpp:2878 treemap.cpp:2879 treemap.cpp:2880
-#, c-format
-msgid "Width %1"
-msgstr "Width %1"
+#: partselection.cpp:292
+msgid "Select All Parts"
+msgstr "Select All Parts"
 
-#: treemap.cpp:2902
-msgid "Visible"
-msgstr "Visible"
+#: partselection.cpp:294
+msgid "Visible Parts"
+msgstr "Visible Parts"
 
-#: treemap.cpp:2903
-msgid "Take Space From Children"
-msgstr "Take Space From Children"
+#: partselection.cpp:296
+msgid "Hide Selected Parts"
+msgstr "Hide Selected Parts"
 
-#: treemap.cpp:2905
-msgid "Top Left"
-msgstr "Top Left"
+#: partselection.cpp:297
+msgid "Unhide Hidden Parts"
+msgstr "Unhide Hidden Parts"
 
-#: treemap.cpp:2906
-msgid "Top Center"
-msgstr "Top Centre"
+#: partselection.cpp:322
+msgid "Partitioning Mode"
+msgstr "Partitioning Mode"
 
-#: treemap.cpp:2907
-msgid "Top Right"
-msgstr "Top Right"
+#: partselection.cpp:323
+msgid "Diagram Mode"
+msgstr "Diagram Mode"
 
-#: treemap.cpp:2909
-msgid "Bottom Center"
-msgstr "Bottom Centre"
+#: partselection.cpp:324
+msgid "Zoom Function"
+msgstr "Zoom Function"
 
-#: treemap.cpp:2910
-msgid "Bottom Right"
-msgstr "Bottom Right"
+#: partselection.cpp:325
+msgid "Show Direct Calls"
+msgstr "Show Direct Calls"
 
-#: treemap.cpp:2987
-msgid "No %1 Limit"
-msgstr "No %1 Limit"
+#: partselection.cpp:326
+msgid "Increment Shown Call Levels"
+msgstr "Increment Shown Call Levels"
 
-#: treemap.cpp:3056 treemap.cpp:3067
-#, c-format
-msgid ""
-"_n: 1 Pixel\n"
-"%n Pixels"
-msgstr ""
-"1 Pixel\n"
-"%n Pixels"
+#: partselection.cpp:340
+msgid "Draw Names"
+msgstr "Draw Names"
 
-#: treemap.cpp:3073
-msgid "Halve Area Limit (to %1)"
-msgstr "Halve Area Limit (to %1)"
+#: partselection.cpp:341
+msgid "Draw Costs"
+msgstr "Draw Costs"
 
-#: treemap.cpp:3118
-#, c-format
-msgid "Depth %1"
-msgstr "Depth %1"
+#: partselection.cpp:343
+msgid "Draw Frames"
+msgstr "Draw Frames"
 
-#: treemap.cpp:3122
-msgid "Decrement (to %1)"
-msgstr "Decrement (to %1)"
+#: partselection.cpp:359
+msgid "Hide Info"
+msgstr "Hide Info"
 
-#: treemap.cpp:3124
-msgid "Increment (to %1)"
-msgstr "Increment (to %1)"
+#: partselection.cpp:361
+msgid "Show Info"
+msgstr "Show Info"
 
-#: callitem.cpp:82 partlistitem.cpp:152
-msgid "(active)"
-msgstr "(active)"
+#: partselection.cpp:541
+msgid "(no trace loaded)"
+msgstr "(no trace loaded)"
 
 #: instrview.cpp:129
 msgid "Hex"
@@ -2918,37 +2750,205 @@ msgstr "There seems to be an error trying to execute the command"
 msgid "Check that the ELF object used in the command exists."
 msgstr "Check that the ELF object used in the command exists."
 
-#: partlistitem.cpp:49
-msgid " (Thread %1)"
-msgstr " (Thread %1)"
+#: instritem.cpp:137
+msgid "Jump %1 of %2 times to 0x%3"
+msgstr "Jump %1 of %2 times to 0x%3"
 
-#: partlistitem.cpp:56
-msgid "(none)"
-msgstr "(none)"
+#: instritem.cpp:142
+msgid "Jump %1 times to 0x%2"
+msgstr "Jump %1 times to 0x%2"
 
-#: main.cpp:38
-msgid "Run <exec> under cachegrind"
-msgstr "Run <exec> under cachegrind"
+#: treemap.cpp:1281
+#, c-format
+msgid "Text %1"
+msgstr "Text %1"
 
-#: main.cpp:39
-msgid "Show information of this trace"
-msgstr "Show information of this trace"
+#: treemap.cpp:2809
+msgid "Recursive Bisection"
+msgstr "Recursive Bisection"
 
-#: main.cpp:46
-msgid "KCachegrind"
-msgstr "KCachegrind"
+#: treemap.cpp:2810
+msgid "Columns"
+msgstr "Columns"
 
-#: main.cpp:48
-msgid "TDE Frontend for Cachegrind"
-msgstr "TDE Frontend for Cachegrind"
+#: treemap.cpp:2811
+msgid "Rows"
+msgstr "Rows"
 
-#: main.cpp:50
-msgid "(C) 2002, 2003, 2004"
-msgstr "(C) 2002, 2003, 2004"
+#: treemap.cpp:2812
+msgid "Always Best"
+msgstr "Always Best"
 
-#: main.cpp:53
-msgid "Author/Maintainer"
-msgstr "Author/Maintainer"
+#: treemap.cpp:2813
+msgid "Best"
+msgstr "Best"
+
+#: treemap.cpp:2814
+msgid "Alternate (V)"
+msgstr "Alternate (V)"
+
+#: treemap.cpp:2815
+msgid "Alternate (H)"
+msgstr "Alternate (H)"
+
+#: treemap.cpp:2872
+msgid "Nesting"
+msgstr "Nesting"
+
+#: treemap.cpp:2875
+msgid "Correct Borders Only"
+msgstr "Correct Borders Only"
+
+#: treemap.cpp:2877 treemap.cpp:2878 treemap.cpp:2879 treemap.cpp:2880
+#, c-format
+msgid "Width %1"
+msgstr "Width %1"
+
+#: treemap.cpp:2902
+msgid "Visible"
+msgstr "Visible"
+
+#: treemap.cpp:2903
+msgid "Take Space From Children"
+msgstr "Take Space From Children"
+
+#: treemap.cpp:2905
+msgid "Top Left"
+msgstr "Top Left"
+
+#: treemap.cpp:2906
+msgid "Top Center"
+msgstr "Top Centre"
+
+#: treemap.cpp:2907
+msgid "Top Right"
+msgstr "Top Right"
+
+#: treemap.cpp:2909
+msgid "Bottom Center"
+msgstr "Bottom Centre"
+
+#: treemap.cpp:2910
+msgid "Bottom Right"
+msgstr "Bottom Right"
+
+#: treemap.cpp:2987
+msgid "No %1 Limit"
+msgstr "No %1 Limit"
+
+#: treemap.cpp:3056 treemap.cpp:3067
+#, c-format
+msgid ""
+"_n: 1 Pixel\n"
+"%n Pixels"
+msgstr ""
+"1 Pixel\n"
+"%n Pixels"
+
+#: treemap.cpp:3073
+msgid "Halve Area Limit (to %1)"
+msgstr "Halve Area Limit (to %1)"
+
+#: treemap.cpp:3118
+#, c-format
+msgid "Depth %1"
+msgstr "Depth %1"
+
+#: treemap.cpp:3122
+msgid "Decrement (to %1)"
+msgstr "Decrement (to %1)"
+
+#: treemap.cpp:3124
+msgid "Increment (to %1)"
+msgstr "Increment (to %1)"
+
+#: traceitemview.cpp:53
+msgid "No description available"
+msgstr "No description available"
+
+#: coverageview.cpp:48 coverageview.cpp:54
+msgid "Distance"
+msgstr "Distance"
+
+#: coverageview.cpp:55
+msgid "Calling"
+msgstr "Calling"
+
+#: 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>"
 
 #~ 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 f8e55c7e915..8ee9f64ff53 100644
--- a/tde-i18n-en_GB/messages/tdesdk/tdefile_cpp.po
+++ b/tde-i18n-en_GB/messages/tdesdk/tdefile_cpp.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_cpp\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
diff --git a/tde-i18n-en_GB/messages/tdesdk/tdefile_diff.po b/tde-i18n-en_GB/messages/tdesdk/tdefile_diff.po
index fc5937f0196..446ed00ba0c 100644
--- a/tde-i18n-en_GB/messages/tdesdk/tdefile_diff.po
+++ b/tde-i18n-en_GB/messages/tdesdk/tdefile_diff.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_diff\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
diff --git a/tde-i18n-en_GB/messages/tdesdk/tdefile_po.po b/tde-i18n-en_GB/messages/tdesdk/tdefile_po.po
index 891048dce9c..b83cf05fd92 100644
--- a/tde-i18n-en_GB/messages/tdesdk/tdefile_po.po
+++ b/tde-i18n-en_GB/messages/tdesdk/tdefile_po.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
diff --git a/tde-i18n-en_GB/messages/tdesdk/tdefile_ts.po b/tde-i18n-en_GB/messages/tdesdk/tdefile_ts.po
index 8b7a062b963..2e2dc8b6fa4 100644
--- a/tde-i18n-en_GB/messages/tdesdk/tdefile_ts.po
+++ b/tde-i18n-en_GB/messages/tdesdk/tdefile_ts.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_ts\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
diff --git a/tde-i18n-en_GB/messages/tdesdk/tdeio_svn.po b/tde-i18n-en_GB/messages/tdesdk/tdeio_svn.po
index 107641194e9..bfd2ad7f881 100644
--- a/tde-i18n-en_GB/messages/tdesdk/tdeio_svn.po
+++ b/tde-i18n-en_GB/messages/tdesdk/tdeio_svn.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_svn\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
diff --git a/tde-i18n-en_GB/messages/tdesdk/umbrello.po b/tde-i18n-en_GB/messages/tdesdk/umbrello.po
index abd228b59a1..54fe4278a5f 100644
--- a/tde-i18n-en_GB/messages/tdesdk/umbrello.po
+++ b/tde-i18n-en_GB/messages/tdesdk/umbrello.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-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"
@@ -17,259 +17,40 @@ msgstr ""
 "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
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
 #, fuzzy
-msgid "AlignQt::Vertical Distribute"
-msgstr "Align Vertical Middle"
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello UML Modeller Authors"
 
-#: aligntoolbar.cpp:47
+#: docgenerators/main.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"
+msgid "File to transform"
+msgstr "File to open"
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
 
-#: tips.txt:91
+#: docgenerators/main.cpp:64
+#, fuzzy
 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"
+"(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"
 
-#: 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"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello UML Modeller Authors"
 
-#: 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"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Export as Picture..."
 
-#: tips.txt:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 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
@@ -284,781 +65,6 @@ msgstr "There was a problem saving file: %1"
 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"
@@ -1128,6 +134,14 @@ 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"
@@ -1240,98 +254,69 @@ msgstr "UNDEFINED"
 msgid "Select"
 msgstr "Select"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "new_association"
-
-#: 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"
-
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "Export as Picture..."
-
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
+#: 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."
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello UML Modeller Authors"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "File to open"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
+#: clipboard/umlclipboard.cpp:691 uml.cpp:851
+msgid "Paste Error"
+msgstr "Paste Error"
 
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: codegenerator.cpp:473
 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"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello UML Modeller Authors"
+"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."
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Exiting..."
+#: codegenerator.cpp:473
+msgid "Cannot Open File"
+msgstr "Cannot Open File"
 
-#: umlviewimageexporter.cpp:50
+#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
 msgid ""
-"An error happened when exporting the image:\n"
+"Cannot create the folder:\n"
 msgstr ""
+"Cannot create the folder:\n"
 
-#: umlviewimageexporter.cpp:66
+#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"\n"
+"Please check the access rights"
 msgstr ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"\n"
+"Please check the access rights"
 
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "File Already Exists"
+#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+msgid "Cannot Create Folder"
+msgstr "Cannot Create Folder"
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Overwrite"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Enter State 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."
+#: 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:"
+
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Enter Activity"
+
+#: 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"
 
 #: umldoc.cpp:82 umldoc.cpp:1518
 msgid "UML Model"
@@ -1438,14 +423,66 @@ msgstr "deployment diagram"
 msgid "entity relationship diagram"
 msgstr "entity relationship diagram"
 
+#: 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"
+
+#: 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:"
+
 #: umldoc.cpp:984 umldoc.cpp:1017
 msgid "That is an invalid name for a diagram."
 msgstr "That is an invalid name for a diagram."
 
+#: 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"
+
 #: umldoc.cpp:998 umldoc.cpp:1025
 msgid "A diagram is already using that name."
 msgstr "A diagram is already using that name."
 
+#: 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"
+
+#: 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: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."
+
+#: 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"
+
 #: umldoc.cpp:1099
 msgid "Are you sure you want to delete diagram %1?"
 msgstr "Are you sure you want to delete diagram %1?"
@@ -1479,1239 +516,105 @@ msgstr "kde-uml-Diagram"
 msgid "/autosave%1"
 msgstr "/autosave%1"
 
-#: 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."
-
-#: 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"
-
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Attributes"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operations"
-
-#: 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/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Operation Name Invalid"
-
-#: 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."
-
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Association Properties"
-
-#. 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"
-
-#: 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/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Roles"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Role 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/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Association font"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">No Options Available.</p>"
-
-#. 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
-msgid "&Name:"
-msgstr "&Name:"
-
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Type:"
-
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Stereotype name:"
-
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Abstract operation"
-
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Classifier &scope (\"static\")"
-
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Query (\"const\")"
-
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Visibility"
-
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&ublic"
-
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivate"
-
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Prot&ected"
-
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementation"
-
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parameters"
-
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Ne&w Parameter..."
-
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "You have entered an invalid parameter name."
-
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Parameter Name Invalid"
-
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Parameter Name Not Unique"
-
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"The parameter name you have chosen is already being used in this operation."
-
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "You have entered an invalid operation name."
-
-#. 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:"
-
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Parameter Properties"
-
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Initial value:"
-
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Passing Direction"
-
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
-msgstr ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
-
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Class &name:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Actor &name:"
-
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Package &name:"
-
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Use case &name:"
-
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Interface &name:"
-
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Component &name:"
-
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Artifact &name:"
-
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Enum &name:"
-
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Datatype &name:"
-
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Entity &name:"
-
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "&Stereotype name:"
-
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Package name:"
-
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&bstract class"
-
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "A&bstract use case"
-
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Executable"
-
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Draw As"
-
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Default"
-
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Library"
-
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Table"
-
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tected"
-
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Imple&mentation"
-
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Class name:"
-
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Instance name:"
-
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Draw as actor"
-
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Multiple instance"
-
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Show destruction"
-
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Component name:"
-
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Node name:"
-
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
-msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
-msgstr ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Name is Not Unique"
-
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Umbrello Setup"
-
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "User Interface"
-
-#: dialogs/settingsdlg.cpp:47
-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:"
-
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "D&efault Colour"
-
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Fill colour:"
-
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "De&fault Colour:"
-
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Line width:"
-
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "D&efault Width"
-
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Use fill colour"
-
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Enable undo"
-
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Use tabbed diagrams"
-
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Use new C++/Java/Ruby generators"
-
-#: dialogs/settingsdlg.cpp:120
-#, fuzzy
-msgid "Use angular association lines"
-msgstr "Default association field scope:"
-
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Autosave"
-
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "E&nable autosave"
-
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Select auto-save time interval (mins):"
-
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Set autosave suffix:"
-
-#: dialogs/settingsdlg.cpp:148
-msgid ""
-"<qt>"
-"<p>The autosave file will be saved to ~/autosave.xmi if the autosaving occurs "
-"before you have manually saved the file.</p>"
-"<p>If you've already saved it, the autosave file will be saved in the same "
-"folder as the file and will be named like the file's name, followed by the "
-"suffix specified.</p>"
-"<p>If the suffix is equal to the suffix of the file you've saved, the autosave "
-"will overwrite your file automatically.</p></qt>"
-msgstr ""
-
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Startup"
-
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Sta&rtup logo"
-
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Tip of the day"
-
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Load last project"
-
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Start new project with:"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "No Diagram"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Class Diagram"
-
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Use Case Diagram"
-
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Sequence Diagram"
-
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Collaboration Diagram"
-
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "State Diagram"
-
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Activity Diagram"
-
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Component Diagram"
-
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Deployment Diagram"
-
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Class Settings"
-
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Show &visibility"
-
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Show attributes"
-
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Show operations"
-
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Show stereot&ype"
-
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Show attribute signature"
-
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Show package"
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, no-c-format
-msgid "Show operation signature"
-msgstr "Show operation signature"
-
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Starting Scope"
-
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Default attribute scope:"
-
-#: dialogs/settingsdlg.cpp:255
-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"
-
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Code Generation Settings"
-
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Code Viewer Settings"
-
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Associations"
-
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Contained Items"
-
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Widget Colours"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Display"
-
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Display Options"
-
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Attribute Settings"
-
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Operation Settings"
-
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Templates"
-
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Templates Settings"
-
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Enum Literals"
-
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Enum Literals Settings"
-
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Entity Attributes"
-
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Entity Attributes Settings"
-
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Contents Settings"
-
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Class Associations"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Role Properties"
-
-#: 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/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/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Destination File Already Exists"
-
-#: dialogs/overwritedialogue.cpp:31
-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."
-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"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Generate Similar File Name"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Do Not Generate File"
-
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Initial state"
-
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "End state"
-
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "State type:"
-
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "State name:"
-
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Widget Colour"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Activities"
-
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&ew Attribute..."
-
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "N&ew Operation..."
-
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "N&ew Template..."
-
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "N&ew Enum Literal..."
-
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "N&ew Entity Attribute..."
-
-#: 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"
-
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Class Operations"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "New Activity..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Rename"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "New Activity"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Rename Activity"
-
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Enter the new name of the activity:"
-
-#: 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: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 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/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/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"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Classes Display Options"
-
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagram Colours"
-
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "The name you have entered is invalid."
-
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "The name you have entered is not unique."
-
-#. 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"
-
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generate"
-
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Finish"
-
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Code Generated"
-
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Not Generated"
-
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Not Yet Generated"
-
-#: 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?"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Externalise Folder"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Output Folder Does Not Exist"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Enter Model Name"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Create Folder"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Enter the new name of the model:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Do Not Create"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Views"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: umllistview.cpp:1906
 msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Error Creating Folder"
+"The name you entered was invalid.\n"
+"Creation process has been cancelled."
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Please select a valid folder."
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Name Not Valid"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: umllistview.cpp:1923 umllistview.cpp:2160
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Error Writing to Output Folder"
-
-#: 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."
-
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Please Choose Valid Folder"
-
-#: 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:"
+"The name you entered was not unique!\n"
+"Creation process has been cancelled."
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Custom operation:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Creation cancelled"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Template Properties"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Loading listview..."
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "You have entered an invalid template name."
+#: 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."
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Template Name Invalid"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Folder Not Empty"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: classifier.cpp:201
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"An operation with the same name and signature already exists. You can not add "
+"it again."
 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"
-
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Note Documentation"
-
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Initial activity"
-
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "End activity"
+"An operation with the same name and signature already exists. You can not add "
+"it again."
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Activity type:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Enter Activity Name"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Activity name:"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "new state"
 
-#. 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 ""
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalisation"
 
-#: objectwidget.cpp:90
-msgid "Rename Object"
-msgstr "Rename Object"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Self Association"
 
-#: objectwidget.cpp:91
-msgid "Enter object name:"
-msgstr "Enter object name:"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Collaboration Message"
 
-#: 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 ""
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sequence Message"
 
-#: 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 ""
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Collaboration Self Message"
 
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Cannot Create Folder"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Sequence Self Message"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Can not save an empty diagram"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realisation"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr ""
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Uni Association"
 
 #. i18n: file umbrelloui.rc line 5
 #: rc.cpp:6
@@ -2749,6 +652,18 @@ msgstr "&Code"
 msgid "Active &Language"
 msgstr "Active &Language"
 
+#. 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"
+
 #. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
 #: rc.cpp:33 rc.cpp:156
 #, no-c-format
@@ -2773,6 +688,16 @@ msgstr "Style:"
 msgid "<p align=\"center\">C++ Code Generation</p>"
 msgstr "<p align=\"center\">C++ Code Generation</p>"
 
+#. 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"
+
 #. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
 #: rc.cpp:48
 #, no-c-format
@@ -2899,6 +824,30 @@ msgstr "Association accessor methods"
 msgid "Attribute accessor methods"
 msgstr "Attribute accessor methods"
 
+#. 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 codegenerators/javacodegenerationformbase.ui line 144
 #: rc.cpp:129 rc.cpp:186
 #, no-c-format
@@ -2947,6 +896,12 @@ msgstr "Begin-End (=begin  =end)"
 msgid "<p align=\"center\">Ruby Code Generation</p>"
 msgstr "<p align=\"center\">Ruby Code Generation</p>"
 
+#. 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"
+
 #. i18n: file dialogs/codegenerationoptionsbase.ui line 69
 #: rc.cpp:228
 #, no-c-format
@@ -3231,6 +1186,12 @@ msgstr "Press the Generation button to start the code generation"
 msgid "Generation Status"
 msgstr "Generation Status"
 
+#. 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"
+
 #. i18n: file dialogs/codeviewerdialogbase.ui line 43
 #: rc.cpp:369
 #, no-c-format
@@ -3303,6 +1264,12 @@ msgstr "<p align=\"right\">Editable text:</p>"
 msgid "Diagram Properties"
 msgstr "Diagram Properties"
 
+#. i18n: file dialogs/diagrampropertiespage.ui line 61
+#: dialogs/assocgenpage.cpp:67 rc.cpp:408
+#, no-c-format
+msgid "Name:"
+msgstr "Name:"
+
 #. i18n: file dialogs/diagrampropertiespage.ui line 92
 #: rc.cpp:411
 #, no-c-format
@@ -3315,6 +1282,12 @@ msgstr "Zoom:"
 msgid "%"
 msgstr "%"
 
+#. i18n: file dialogs/diagrampropertiespage.ui line 146
+#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#, no-c-format
+msgid "Show operation signature"
+msgstr "Show operation signature"
+
 #. i18n: file dialogs/diagrampropertiespage.ui line 186
 #: rc.cpp:420
 #, no-c-format
@@ -3393,6 +1366,12 @@ msgstr ""
 msgid "&Image type:"
 msgstr "State type:"
 
+#. 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 ""
+
 #. i18n: file dialogs/exportallviewsdialogbase.ui line 100
 #: rc.cpp:466
 #, fuzzy, no-c-format
@@ -3418,85 +1397,241 @@ msgid ""
 "view, use case view and so on aren't created)."
 msgstr ""
 
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
+#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#, no-c-format
+msgid "Role Properties"
+msgstr "Role Properties"
+
+#. 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 dialogs/umlrolepropertiesbase.ui line 106
 #: rc.cpp:495
 #, no-c-format
 msgid "Role Changeability"
 msgstr "Role Changeability"
 
+#. 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"
+
+#. 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 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 156
 #: rc.cpp:507
 #, no-c-format
 msgid "Role Visibility"
 msgstr "Role Visibility"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalisation"
+#. 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"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Self Association"
+#: 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"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Collaboration Message"
+#: 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"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sequence Message"
+#: 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"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Collaboration Self Message"
+#: 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"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Sequence Self Message"
+#: 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"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realisation"
+#: 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"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Uni Association"
+#: 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"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Enter Activity"
+#: 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"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "General Options"
+#: 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"
 
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Package is a namespace"
+#: 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"
 
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtual destructors"
+#: 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"
 
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Generate empty constructors"
+#: 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"
 
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Generate accessor methods"
+#: 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"
 
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operations are inline"
+#: 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"
 
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Accessors are inline"
+#: 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"
 
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Accessors are public"
+#: 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"
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -3633,10 +1768,26 @@ msgstr "Import Classes..."
 msgid "Subsystem"
 msgstr ""
 
+#: 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:535 listpopupmenu.cpp:608
 msgid "Folder"
 msgstr "Folder"
 
+#: listpopupmenu.cpp:541 uml.cpp:428
+msgid "Entity Relationship Diagram..."
+msgstr "Entity Relationship Diagram..."
+
+#: listpopupmenu.cpp:551 uml.cpp:423
+msgid "Use Case Diagram..."
+msgstr "Use Case Diagram..."
+
 #: listpopupmenu.cpp:555
 msgid "Text Line..."
 msgstr "Text Line..."
@@ -3669,10 +1820,46 @@ msgstr "New Entity Attribute..."
 msgid "Export as Picture..."
 msgstr "Export as Picture..."
 
+#: listpopupmenu.cpp:615 uml.cpp:420
+msgid "Class Diagram..."
+msgstr "Class 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:618 uml.cpp:421
+msgid "Sequence Diagram..."
+msgstr "Sequence Diagram..."
+
+#: listpopupmenu.cpp:619 uml.cpp:422
+msgid "Collaboration Diagram..."
+msgstr "Collaboration Diagram..."
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Attributes"
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operations"
+
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Public Only"
 
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Visibility"
+
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Operation Signature"
@@ -3681,6 +1868,15 @@ msgstr "Operation Signature"
 msgid "Attribute Signature"
 msgstr "Attribute Signature"
 
+#: listpopupmenu.cpp:695 stereotype.cpp:76
+msgid "Stereotype"
+msgstr "Stereotype"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Show"
+
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Attribute..."
@@ -3705,6 +1901,14 @@ msgstr "Fill Colour..."
 msgid "Use Fill Color"
 msgstr "Use Fill Colour"
 
+#: 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"
+
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Actor..."
@@ -3794,6 +1998,285 @@ msgstr "Snap to Grid"
 msgid "Show Grid"
 msgstr "Show Grid"
 
+#: 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"
+
+#: 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"
+
+#: 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."
+
+#: _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"
+
+#: 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."
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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"
+
+#: codeimport/classimport.cpp:34
+#, fuzzy
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importing file: %1"
+
+#: 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"
+
+#: objectwidget.cpp:90
+msgid "Rename Object"
+msgstr "Rename Object"
+
+#: objectwidget.cpp:91
+msgid "Enter object name:"
+msgstr "Enter object name:"
+
+#: operation.cpp:185
+msgid "new_parameter"
+msgstr "new_parameter"
+
+#: 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"
+
+#: 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?"
+
 #: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
 msgid "Rename canceled"
 msgstr "Rename cancelled"
@@ -3814,22 +2297,1462 @@ msgstr ""
 "The name you entered was invalid.\n"
 "Renaming process has been cancelled."
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Enter operation name:"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "new_association"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Enter role name:"
+#: 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"
+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"
+
+#: 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."
+
+#: 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"
+
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Class &name:"
+
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Actor &name:"
+
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Package &name:"
+
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Use case &name:"
+
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Interface &name:"
+
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Component &name:"
+
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Artifact &name:"
+
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Enum &name:"
+
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Datatype &name:"
+
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Entity &name:"
+
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "&Stereotype name:"
+
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Package name:"
+
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&bstract class"
+
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "A&bstract use case"
+
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Executable"
+
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Draw As"
+
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Default"
+
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Library"
+
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Table"
+
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&ublic"
+
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivate"
+
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tected"
+
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Imple&mentation"
+
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Class name:"
+
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Instance name:"
+
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Draw as actor"
+
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Multiple instance"
+
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Show destruction"
+
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Component name:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Node name:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Stereotype name:"
+
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
+msgid ""
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
+msgstr ""
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Name is Not Unique"
+
+#: 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/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Activities"
+
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "New Activity..."
+
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Rename"
+
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "New Activity"
+
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Rename Activity"
+
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Enter the new name of the activity:"
+
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Association Properties"
+
+#: 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/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Roles"
+
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Role 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/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Association font"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Template 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:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Type:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Name:"
+
+#: 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"
+
+#: 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/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Display"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Classes Display Options"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagram Colours"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "The name you have entered is invalid."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "The name you have entered is not unique."
+
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Type:"
+
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
+msgstr "Umbrello Setup"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "User Interface"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "User Interface Settings"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Line colour:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "D&efault Colour"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Fill colour:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "De&fault Colour:"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Line width:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "D&efault Width"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Use fill colour"
+
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Enable undo"
+
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Use tabbed diagrams"
+
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Use new C++/Java/Ruby generators"
+
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "Default association field scope:"
+
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Autosave"
+
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "E&nable autosave"
+
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Select auto-save time interval (mins):"
+
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Set autosave suffix:"
+
+#: dialogs/settingsdlg.cpp:148
+msgid ""
+"<qt>"
+"<p>The autosave file will be saved to ~/autosave.xmi if the autosaving occurs "
+"before you have manually saved the file.</p>"
+"<p>If you've already saved it, the autosave file will be saved in the same "
+"folder as the file and will be named like the file's name, followed by the "
+"suffix specified.</p>"
+"<p>If the suffix is equal to the suffix of the file you've saved, the autosave "
+"will overwrite your file automatically.</p></qt>"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Startup"
+
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Sta&rtup logo"
+
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Tip of the day"
+
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Load last project"
+
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Start new project with:"
+
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "No Diagram"
+
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Class Diagram"
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Use Case Diagram"
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Sequence Diagram"
+
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Collaboration Diagram"
+
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "State Diagram"
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Activity Diagram"
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Component Diagram"
+
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Deployment Diagram"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Class Settings"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Show &visibility"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Show attributes"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Show operations"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Show stereot&ype"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Show attribute signature"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Show package"
+
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Starting Scope"
+
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Default attribute scope:"
+
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Default operation scope:"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Code Generation"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Code Generation Settings"
+
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Code Viewer Settings"
+
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Operation Properties"
+
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Abstract operation"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Classifier &scope (\"static\")"
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Query (\"const\")"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Prot&ected"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementation"
+
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parameters"
+
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Ne&w Parameter..."
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "You have entered an invalid parameter name."
+
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Parameter Name Invalid"
+
+#: dialogs/umloperationdialog.cpp:339
+msgid ""
+"The parameter name you have chosen\n"
+"is already being used in this operation."
+msgstr ""
+"The parameter name you have chosen\n"
+"is already being used in this operation."
+
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Parameter Name Not Unique"
+
+#: dialogs/umloperationdialog.cpp:406
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr ""
+"The parameter name you have chosen is already being used in this operation."
+
+#: dialogs/umloperationdialog.cpp:456
+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/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"
+
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Contained Items"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Note Documentation"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&ew Attribute..."
+
+#: 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/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Enum Literals"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "N&ew Enum Literal..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Entity Attributes"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "N&ew Entity Attribute..."
+
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Initial activity"
+
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "End activity"
+
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Activity type:"
+
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Activity name:"
+
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Widget Colours"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Attribute Properties"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Initial value:"
+
+#: 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/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/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:135
+msgid "No diagrams selected."
+msgstr "No diagrams selected."
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Display Options"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Attribute Settings"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Operation Settings"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Templates Settings"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Enum Literals Settings"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Entity Attributes Settings"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Contents Settings"
+
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Associations"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Class Associations"
+
+#: 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"
+
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Initial state"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "End state"
+
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "State type:"
+
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "State name:"
+
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Widget Colour"
+
+#: 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"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Class Operations"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Parameter Properties"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Passing Direction"
+
+#: dialogs/parmpropdlg.cpp:84
+msgid ""
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
+"is a parameter for reading and writing."
+msgstr ""
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
+"is a parameter for reading and writing."
+
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generate"
+
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Finish"
+
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Code Generated"
+
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Not Generated"
+
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Not Yet Generated"
+
+#: 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?"
+
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Output Folder Does Not Exist"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Create Folder"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Do Not Create"
+
+#: 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."
+
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Error Creating Folder"
+
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Please select a valid folder."
+
+#: 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."
+
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Error Writing to Output Folder"
+
+#: 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."
+
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Please Choose Valid Folder"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Destination File Already Exists"
+
+#: dialogs/overwritedialogue.cpp:31
+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."
+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"
+
+#: 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"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Do Not Generate File"
+
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">No Options Available.</p>"
+
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multiplicity"
 
 #: associationwidget.cpp:2329 floatingtextwidget.cpp:164
 msgid "Enter multiplicity:"
 msgstr "Enter multiplicity:"
 
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Association Name"
+
 #: associationwidget.cpp:2347 floatingtextwidget.cpp:171
 msgid "Enter association name:"
 msgstr "Enter association name:"
 
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Role Name"
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Enter role name:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Enter operation name:"
+
 #: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
 msgid "Enter new text:"
 msgstr "Enter new text:"
@@ -3842,47 +3765,81 @@ msgstr "ERROR"
 msgid "Change Text"
 msgstr "Change Text"
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multiplicity"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Align Left"
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Association Name"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Align Right"
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Role Name"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Align Top"
 
-#: main.cpp:32 main.cpp:93
-msgid "Umbrello UML Modeller"
-msgstr "Umbrello UML Modeller"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Align Bottom"
 
-#: main.cpp:40
-msgid "File to open"
-msgstr "File to open"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "AlignQt::Vertical Middle"
+msgstr "Align Vertical Middle"
 
-#: main.cpp:41
-msgid "export diagrams to extension and exit"
-msgstr "export diagrams to extension and exit"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "AlignQt::Horizontal Middle"
+msgstr "Align Horizontal Middle"
 
-#: main.cpp:42
-msgid "the local directory to save the exported diagrams in"
+#: 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."
 
-#: main.cpp:42
-msgid "the directory of the file"
+#: 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."
 
-#: main.cpp:43
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Reserved Keyword"
+
+#: umlviewimageexporter.cpp:46
+#, fuzzy
+msgid "Exporting view..."
+msgstr "Exiting..."
+
+#: umlviewimageexporter.cpp:50
 msgid ""
-"keep the tree structure used to store the views in the document in the target "
-"directory"
+"An error happened when exporting the image:\n"
 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"
+#: 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"
 
 #: model_utils.cpp:244
 msgid "new_actor"
@@ -3957,13 +3914,56 @@ msgstr "Unknown return type"
 msgid "Unspecified error"
 msgstr "Unspecified error"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Incorrect use of associations."
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Add Base Class"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Association Error"
+#: 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"
+
+#: 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"
+
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
 #~ msgid "new_stereotype"
 #~ msgstr "new_stereotype"
author	Automated System <kb9vqf@pearsoncomputing.net>	2014-09-29 12:26:02 -0500
committer	Automated System <kb9vqf@pearsoncomputing.net>	2014-09-29 12:26:02 -0500
commit	ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c (patch)
tree	bf4fc5ad5f5d27517ae17ce5d396e492aafde6eb /tde-i18n-en_GB/messages/tdesdk
parent	dde6a6f118e2358c2aace236dd18d5bca405381c (diff)
download	tde-i18n-ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c.tar.gz tde-i18n-ff4fa4a4bcbcb8f46cd9231b0a5f3b3d19f5989c.zip