Automated l10n update (.po files)

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2014-09-29 03:08:03 -0500
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2014-09-29 03:08:03 -0500
commit: 242434109c14a494dee7738b9c343f5947d20506 (patch)
tree: ea25930767128361a7669f1a25a479a66ccdfbeb /tde-i18n-cy/messages/tdesdk
parent: 8819501c6a160b7ae106b1a968bc953b0f0bc465 (diff)
download: tde-i18n-242434109c14a494dee7738b9c343f5947d20506.tar.gz
tde-i18n-242434109c14a494dee7738b9c343f5947d20506.zip
16 files changed, 6088 insertions, 6054 deletions
diff --git a/tde-i18n-cy/messages/tdesdk/cervisia.po b/tde-i18n-cy/messages/tdesdk/cervisia.po
index f9bd8b2f137..d54586a3bb8 100644
--- a/tde-i18n-cy/messages/tdesdk/cervisia.po
+++ b/tde-i18n-cy/messages/tdesdk/cervisia.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/cervisia.po\n"
-"POT-Creation-Date: 2007-09-24 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -548,7 +549,7 @@ msgstr ""
 #: cervisiapart.cpp:713
 msgid ""
 "Cervisia %1\n"
-"(Using TDE %2)\n"
+"(Using KDE %2)\n"
 "\n"
 "Copyright (c) 1999-2002\n"
 "Bernd Gehrmann <bernd@mail.berlios.de>\n"
diff --git a/tde-i18n-cy/messages/tdesdk/cvsservice.po b/tde-i18n-cy/messages/tdesdk/cvsservice.po
index b79bd311262..7f1ac172865 100644
--- a/tde-i18n-cy/messages/tdesdk/cvsservice.po
+++ b/tde-i18n-cy/messages/tdesdk/cvsservice.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/cvsservice.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +46,7 @@ msgstr ""
 msgid "Repository:"
 msgstr ""
 
-#: cvsloginjob.cpp:116
+#: cvsloginjob.cpp:117
 msgid "Please type in your password for the repository below."
 msgstr ""
 
diff --git a/tde-i18n-cy/messages/tdesdk/kbabel.po b/tde-i18n-cy/messages/tdesdk/kbabel.po
index 840034066d4..97f215ebe16 100644
--- a/tde-i18n-cy/messages/tdesdk/kbabel.po
+++ b/tde-i18n-cy/messages/tdesdk/kbabel.po
@@ -1,1474 +1,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/kbabel.po\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: catalogmanager/catalogmanagerview.cpp:89
-msgid "Name"
-msgstr "Enw"
-
-#: catalogmanager/catalogmanagerview.cpp:90
-msgid "M"
-msgstr "M"
-
-#: catalogmanager/catalogmanagerview.cpp:91
-msgid "Fuzzy"
-msgstr "Niwlaidd"
-
-#: catalogmanager/catalogmanagerview.cpp:92
-msgid "Untranslated"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:93
-msgid "Total"
-msgstr "Cyfanswm"
-
-#: catalogmanager/catalogmanagerview.cpp:94 catalogmanager/future.cpp:5
-#, fuzzy
-msgid "CVS/SVN Status"
-msgstr "Cyflwr"
-
-#: catalogmanager/catalogmanagerview.cpp:95
-msgid "Last Revision"
-msgstr ""
-
-#: addons/tdefile-plugins/tdefile_po.cpp:56
-#: catalogmanager/catalogmanagerview.cpp:96
-msgid "Last Translator"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:178
-#: catalogmanager/catalogmanagerview.cpp:2447
-#: catalogmanager/catalogmanagerview.cpp:2458
-msgid "Log Window"
-msgstr "Ffenestr Gofnodion"
-
-#: catalogmanager/catalogmanagerview.cpp:180
-msgid "C&lear"
-msgstr "&Gwaredu"
-
-#: catalogmanager/catalogmanagerview.cpp:183
-msgid ""
-"<qt>"
-"<p><b>Log window</b></p>\n"
-"<p>In this window the output of the executed commands are shown.</p></qt>"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:194
-msgid ""
-"<qt>"
-"<p><b>Catalog Manager</b></p>\n"
-"<p>The Catalog Manager merges two folders into one tree and displays all\n"
-"PO and POT files in these folders. This way you can easily see if a\n"
-"template has been added or removed. Also some information about the files\n"
-"is displayed.</p>"
-"<p>For more information see section <b>The Catalog Manager</b> "
-"in the online help.</p></qt>"
-msgstr ""
-
-#: 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 ""
-
-#: catalogmanager/catalogmanagerview.cpp:473
-msgid ""
-"Error while trying to read file:\n"
-" %1\n"
-"Maybe it is not a valid file with list of markings."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:519 kbabel/kbabelview.cpp:1451
-msgid "The file %1 already exists. Do you want to overwrite it?"
-msgstr "Mae'r ffeil %1 mewn bod yn barod.  Ydych am ysgrifennu drosto?"
-
-#: catalogmanager/catalogmanagerview.cpp:520 kbabel/kbabelview.cpp:1452
-#: kbabel/kbabelview.cpp:1521
-msgid "&Overwrite"
-msgstr "&Trosysgrifo"
-
-#: catalogmanager/catalogmanagerview.cpp:571
-msgid ""
-"An error occurred while trying to write to file:\n"
-"%1\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:580
-msgid ""
-"An error occurred while trying to upload the file:\n"
-"%1\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:664
-#: catalogmanager/catalogmanagerview.cpp:691
-msgid ""
-"The Catalog Manager is still updating information about the files.\n"
-"If you continue, it will try to update all necessary files, however this can "
-"take a long time and may lead to wrong results. Please wait until all files are "
-"updated."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:769
-#, fuzzy
-msgid ""
-"Statistics for all:\n"
-msgstr "Ystadegau"
-
-#: catalogmanager/catalogmanagerview.cpp:771
-msgid ""
-"Statistics for %1:\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:773
-msgid ""
-"Number of packages: %1\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:776
-msgid ""
-"Complete translated: %1 % (%2)\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:779
-msgid ""
-"Only template available: %1 % (%2)\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:781
-msgid ""
-"Only PO file available: %1 % (%2)\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:783
-msgid ""
-"Number of messages: %1\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:787
-msgid ""
-"Translated: %1 % (%2)\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:790
-msgid ""
-"Fuzzy: %1 % (%2)\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:793
-msgid ""
-"Untranslated: %1 % (%2)\n"
-msgstr ""
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 790
-#: catalogmanager/catalogmanagerview.cpp:795 rc.cpp:1001 rc.cpp:1206
-#, no-c-format
-msgid "Statistics"
-msgstr "Ystadegau"
-
-#: catalogmanager/catalogmanagerview.cpp:820
-msgid ""
-"The file is syntactically correct.\n"
-"Output of \"msgfmt --statistics\":"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:825
-msgid ""
-"The file has syntax errors.\n"
-"Output of \"msgfmt --statistics\":"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:830
-msgid ""
-"The file has header syntax error.\n"
-"Output of \"msgfmt --statistics\":"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:835
-msgid "An error occurred while processing \"msgfmt --statistics\""
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:840
-#: catalogmanager/catalogmanagerview.cpp:929
-msgid ""
-"Cannot execute msgfmt. Please make sure that you have msgfmt in your PATH."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:845
-#: catalogmanager/catalogmanagerview.cpp:934 kbabel/kbabelview.cpp:1649
-msgid "You can use gettext tools only for checking PO files."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:868
-msgid ""
-"All files in folder %1 are syntactically correct.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:873
-msgid ""
-"All files in the base folder are syntactically correct.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:884
-msgid ""
-"At least one file in folder %1 has syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:889
-msgid ""
-"At least one file in the base folder has syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:900
-msgid ""
-"At least one file in folder %1 has header syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:905
-msgid ""
-"At least one file in the base folder has header syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:916
-#, c-format
-msgid ""
-"An error occurred while processing \"msgfmt --statistics *.po\" in folder %1"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:921
-msgid ""
-"An error occurred while processing \"msgfmt --statistics *.po\" in the base "
-"folder"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:1502
-msgid "Do you really want to delete the file %1?"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:1507
-msgid "Was not able to delete the file %1!"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:1766
-msgid ""
-"You have not specified a valid folder for the base folder of the PO files:\n"
-"%1\n"
-"Please check your settings in the project settings dialog."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:1783
-msgid ""
-"You have not specified a valid folder for the base folder of the PO template "
-"files:\n"
-"%1\n"
-"Please check your settings in the project settings dialog."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:1824
-msgid "Reading file information"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:2999
-#: catalogmanager/validateprogress.cpp:98
-msgid ""
-"Cannot instantiate a validation tool.\n"
-"Please check your installation."
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:3000
-#: catalogmanager/validateprogress.cpp:99
-msgid "Validation Tool Error"
-msgstr ""
-
-#: catalogmanager/catalogmanagerview.cpp:3008
-msgid "Validation Options"
-msgstr "Dewisiadau Gwiriant"
-
-#: catalogmanager/markpatterndialog.cpp:113
-msgid "Ma&rk files which match the following pattern:"
-msgstr ""
-
-#: catalogmanager/markpatterndialog.cpp:114
-msgid "&Mark Files"
-msgstr ""
-
-#: catalogmanager/markpatterndialog.cpp:116
-msgid "Unma&rk files which match the following pattern:"
-msgstr ""
-
-#: catalogmanager/markpatterndialog.cpp:117
-msgid "Un&mark Files"
-msgstr ""
-
-#: catalogmanager/validateprogress.cpp:56
-msgid ""
-"_: Caption of dialog\n"
-"Validation"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:222
-#: catalogmanager/validateprogress.cpp:72
-msgid "&Open"
-msgstr "A&gor"
-
-#: catalogmanager/validateprogress.cpp:73
-msgid "&Ignore"
-msgstr "&Anwybyddu"
-
-#: catalogmanager/validateprogress.cpp:186
-msgid ""
-"Validation done.\n"
-"\n"
-"Checked files: %1\n"
-"Number of errors: %2\n"
-"Number of ignored errors: %3"
-msgstr ""
-
-#: catalogmanager/validateprogress.cpp:190
-msgid "Validation Done"
-msgstr ""
-
-#: catalogmanager/main.cpp:178 kbabel/main.cpp:539
-msgid "File to load configuration from"
-msgstr ""
-
-#: catalogmanager/main.cpp:186
-msgid "KBabel - Catalog Manager"
-msgstr "KBabel - Rheolwr Catalog"
-
-#: catalogmanager/main.cpp:187
-msgid "An advanced catalog manager for KBabel"
-msgstr ""
-
-#: catalogmanager/main.cpp:188 kbabel/main.cpp:549
-msgid "(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"
-msgstr ""
-
-#: catalogmanager/main.cpp:190 kbabel/main.cpp:551 kbabeldict/main.cpp:118
-msgid "Original author"
-msgstr "Awdur gwreiddiol"
-
-#: catalogmanager/main.cpp:191 kbabel/main.cpp:558
-msgid "Current maintainer, porting to TDE3/Qt3."
-msgstr ""
-
-#: catalogmanager/main.cpp:193 kbabel/main.cpp:564 kbabeldict/main.cpp:119
-msgid "Current maintainer"
-msgstr "Cynhaliwr cyfredol"
-
-#: catalogmanager/main.cpp:195 kbabel/main.cpp:566
-msgid ""
-"Wrote documentation and sent many bug reports and suggestions for improvements."
-msgstr ""
-
-#: 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 ""
-
-#: catalogmanager/main.cpp:202 kbabel/main.cpp:553
-msgid "Wrote diff algorithm, fixed KSpell and gave a lot of useful hints."
-msgstr ""
-
-#: catalogmanager/main.cpp:204 kbabel/main.cpp:572
-msgid ""
-"Helped keep KBabel up to date with the TDE API and gave a lot of other help."
-msgstr ""
-
-#: catalogmanager/main.cpp:206 kbabel/main.cpp:576
-msgid "Various validation plugins."
-msgstr ""
-
-#: catalogmanager/main.cpp:209 kbabel/main.cpp:579
-msgid "Sponsored development of KBabel for a while."
-msgstr ""
-
-#: catalogmanager/main.cpp:211
-msgid "Support for making diffs and some minor improvements."
-msgstr ""
-
-#: catalogmanager/main.cpp:214 kbabel/main.cpp:581
-msgid "KBabel contains code from Qt"
-msgstr ""
-
-#: catalogmanager/main.cpp:216
-msgid "KBabel contains code from GNU gettext"
-msgstr ""
-
-#: catalogmanager/multiroughtransdlg.cpp:56
-msgid "Files:"
-msgstr "Ffeiliau:"
-
-#: 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 ""
-
-#: 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 ""
-
-#: catalogmanager/multiroughtransdlg.cpp:143 commonui/roughtransdlg.cpp:685
-msgid "Rough Translation Statistics"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:88
-msgid "No CVS repository"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:91
-msgid "Not in CVS"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:94
-#: catalogmanager/libsvn/svnhandler.cpp:96
-msgid "Locally added"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:97
-#: catalogmanager/libsvn/svnhandler.cpp:99
-msgid "Locally removed"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:100
-#: catalogmanager/libsvn/svnhandler.cpp:102
-msgid "Locally modified"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:103
-#: catalogmanager/libsvn/svnhandler.cpp:105
-msgid "Up-to-date"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:106
-#: catalogmanager/libsvn/svnhandler.cpp:108
-msgid "Conflict"
-msgstr ""
-
-#: catalogmanager/libcvs/cvshandler.cpp:109
-#: catalogmanager/libsvn/svnhandler.cpp:113
-msgid "Unknown"
-msgstr "Anhysbys"
-
-#: catalogmanager/libcvs/cvshandler.cpp:189
-#: catalogmanager/libcvs/cvshandler.cpp:228
-msgid ""
-"This is not a valid CVS repository. The CVS commands cannot be executed."
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:311
-#: catalogmanager/libcvs/cvshandler.cpp:375
-#: catalogmanager/libsvn/svndialog.cpp:290
-#: catalogmanager/libsvn/svnhandler.cpp:483
-msgid "[ Starting command ]"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:68
-msgid "CVS Dialog"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:77
-#: catalogmanager/libsvn/svndialog.cpp:74
-msgid "Update the following files:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:80
-#: catalogmanager/libsvn/svndialog.cpp:77
-msgid "Commit the following files:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:83
-msgid "Get status for the following files:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:86
-#: catalogmanager/libsvn/svndialog.cpp:86
-msgid "Get diff for the following files:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:100
-#: catalogmanager/libsvn/svndialog.cpp:103
-msgid "&Old messages:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:108
-#: catalogmanager/libsvn/svndialog.cpp:111
-msgid "&Log message:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:114
-msgid "E&ncoding:"
-msgstr "A&mgodiad:"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:121
-msgid ""
-"_: Descriptive encoding name\n"
-"Recommended ( %1 )"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:122
-msgid ""
-"_: Descriptive encoding name\n"
-"Locale ( %1 )"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:133
-#: catalogmanager/libsvn/svndialog.cpp:124
-msgid "Auto&matically add files if necessary"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:144
-#: catalogmanager/libsvn/svndialog.cpp:135
-msgid "&Commit"
-msgstr "&Cyflwyno"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:147
-#: catalogmanager/libsvn/svndialog.cpp:139
-msgid "&Get Status"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:150
-#: catalogmanager/libsvn/svndialog.cpp:142
-msgid "&Get Diff"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:157
-#: catalogmanager/libsvn/svndialog.cpp:152 commonui/roughtransdlg.cpp:83
-msgid "C&ancel"
-msgstr "&Diddymu"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:165
-#: catalogmanager/libsvn/svndialog.cpp:160
-msgid "Command output:"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:237
-#: catalogmanager/libsvn/svndialog.cpp:233
-#, fuzzy
-msgid "The commit log message is empty. Do you want to continue?"
-msgstr "Mae'r ffeil %1 mewn bod yn barod.  Ydych am ysgrifennu drosto?"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:247
-#, c-format
-msgid "Cannot find encoding: %1"
-msgstr ""
-
-#: 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 ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:268
-#: catalogmanager/libsvn/svndialog.cpp:247
-msgid "Cannot open temporary file for writing. Aborting."
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:280
-#: catalogmanager/libsvn/svndialog.cpp:259
-msgid "Cannot write to temporary file. Aborting."
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:322
-#: catalogmanager/libsvn/svndialog.cpp:301
-msgid "The process could not be started."
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:351
-#: catalogmanager/libsvn/svndialog.cpp:330
-msgid "[ Exited with status %1 ]"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:353
-#: catalogmanager/libsvn/svndialog.cpp:332
-msgid "[ Finished ]"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:358
-#: catalogmanager/libsvn/svndialog.cpp:337 kbabel/kbabel.cpp:642
-msgid "&Show Diff"
-msgstr ""
-
-#: catalogmanager/libcvs/cvsdialog.cpp:401
-#, fuzzy
-msgid ""
-"_: Descriptive encoding name\n"
-"Last choice ( %1 )"
-msgstr "Arall (%1)"
-
-#: catalogmanager/libsvn/svndialog.cpp:65
-msgid "SVN Dialog"
-msgstr ""
-
-#: catalogmanager/libsvn/svndialog.cpp:80
-msgid "Get remote status for the following files:"
-msgstr ""
-
-#: catalogmanager/libsvn/svndialog.cpp:83
-msgid "Get local status for the following files:"
-msgstr ""
-
-#: catalogmanager/libsvn/svndialog.cpp:89
-msgid "Get information for the following files:"
-msgstr ""
-
-#: catalogmanager/libsvn/svndialog.cpp:145
-#, fuzzy
-msgid "&Get Information"
-msgstr "Gwybodaeth Catalog"
-
-#: catalogmanager/libsvn/svnhandler.cpp:90
-msgid "No SVN repository"
-msgstr ""
-
-#: catalogmanager/libsvn/svnhandler.cpp:93
-msgid "Not in SVN"
-msgstr ""
-
-#: catalogmanager/libsvn/svnhandler.cpp:111
-msgid "Error in Working Copy"
-msgstr ""
-
-#: catalogmanager/libsvn/svnhandler.cpp:288
-msgid ""
-"This is not a valid SVN repository. The SVN commands cannot be executed."
-msgstr ""
-
-#: catalogmanager/findinfilesdialog.cpp:50
-msgid "File Options"
-msgstr ""
-
-#: catalogmanager/findinfilesdialog.cpp:53
-msgid "&In all files"
-msgstr ""
-
-#: catalogmanager/findinfilesdialog.cpp:54
-msgid "&Marked files"
-msgstr ""
-
-#: catalogmanager/findinfilesdialog.cpp:55
-msgid "In &templates"
-msgstr ""
-
-#: catalogmanager/findinfilesdialog.cpp:56
-msgid "Ask before ne&xt file"
-msgstr ""
-
-#: catalogmanager/findinfilesdialog.cpp:57
-msgid "Save &without asking"
-msgstr ""
-
-#: 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 ""
-
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 78
-#: catalogmanager/future.cpp:4 rc.cpp:21 rc.cpp:39 rc.cpp:45
-#, no-c-format
-msgid "SVN"
-msgstr ""
-
-#: catalogmanager/future.cpp:8
-msgid "Resolved"
-msgstr ""
-
-#: catalogmanager/future.cpp:9
-msgid "Resolved for Marked"
-msgstr ""
-
-#: catalogmanager/future.cpp:10
-msgid "Revert"
-msgstr "Dychwelyd"
-
-#: catalogmanager/future.cpp:11
-msgid "Revert for Marked"
-msgstr ""
-
-#: catalogmanager/future.cpp:12
-#, fuzzy
-msgid "Cleanup"
-msgstr "&Gwaredu"
-
-#: catalogmanager/future.cpp:13
-msgid "Cleanup for Marked"
-msgstr ""
-
-#: catalogmanager/future.cpp:16
-msgid "No repository"
-msgstr ""
-
-#: catalogmanager/catmanlistitem.cpp:80
-msgid "Message Catalogs"
-msgstr "Catalogau Negesau"
-
-#: catalogmanager/catmanlistitem.cpp:450 catalogmanager/catmanlistitem.cpp:637
-msgid "No version control"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:129 kbabel/kbabel.cpp:132
-#: kbabel/kbabel.cpp:150 kbabel/kbabel.cpp:1754
-#, c-format
-msgid ""
-"Cannot open project file\n"
-"%1"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:130 kbabel/kbabel.cpp:133
-#: kbabel/kbabel.cpp:151 kbabel/kbabel.cpp:1755
-#, fuzzy
-msgid "Project File Error"
-msgstr "Gwall &Blaenorol"
-
-#: catalogmanager/catalogmanager.cpp:225
-msgid "&Open Template"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:228
-msgid "Open in &New Window"
-msgstr "Agor mew&n Ffenestr Newydd"
-
-#: catalogmanager/catalogmanager.cpp:237
-msgid "Fi&nd in Files..."
-msgstr "Ca&nfod mewn Ffeiliau ..."
-
-#: catalogmanager/catalogmanager.cpp:240
-msgid "Re&place in Files..."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:243 kbabel/kbabel.cpp:674
-msgid "&Stop Searching"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:251
-msgid "&Toggle Marking"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:254
-msgid "Remove Marking"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:257
-msgid "Toggle All Markings"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:260
-msgid "Remove All Markings"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:263
-msgid "Mark Modified Files"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:267
-msgid "&Load Markings..."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:270
-msgid "&Save Markings..."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:273
-msgid "&Mark Files..."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:275
-msgid "&Unmark Files..."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:284 kbabel/kbabel.cpp:543
-msgid "Nex&t Untranslated"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:287 kbabel/kbabel.cpp:540
-msgid "Prev&ious Untranslated"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:290 kbabel/kbabel.cpp:537
-msgid "Ne&xt Fuzzy"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:293 kbabel/kbabel.cpp:534
-msgid "Pre&vious Fuzzy"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:296 kbabel/kbabel.cpp:531
-msgid "N&ext Fuzzy or Untranslated"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:299 kbabel/kbabel.cpp:528
-msgid "P&revious Fuzzy or Untranslated"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:303 kbabel/kbabel.cpp:549
-msgid "Next Err&or"
-msgstr "Gwall Ne&saf"
-
-#: catalogmanager/catalogmanager.cpp:306 kbabel/kbabel.cpp:546
-msgid "Previo&us Error"
-msgstr "Gwall &Blaenorol"
-
-#: catalogmanager/catalogmanager.cpp:309
-msgid "Next Te&mplate Only"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:312
-msgid "Previous Temp&late Only"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:315
-msgid "Next Tran&slation Exists"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:318
-msgid "Previous Transl&ation Exists"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:322
-msgid "Previous Marke&d"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:325
-msgid "Next &Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:331 kbabel/kbabel.cpp:594
-msgid "&New..."
-msgstr "&Newydd..."
-
-#: catalogmanager/catalogmanager.cpp:339 kbabel/kbabel.cpp:602
-msgid "C&lose"
-msgstr "C&au"
-
-#: catalogmanager/catalogmanager.cpp:345 kbabel/kbabel.cpp:607
-msgid "&Configure..."
-msgstr "&Ffurfweddu..."
-
-#: catalogmanager/catalogmanager.cpp:350
-msgid "&Statistics"
-msgstr "&Ystadegaeth"
-
-#: catalogmanager/catalogmanager.cpp:353
-msgid "S&tatistics in Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:356
-msgid "Check S&yntax"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:359
-msgid "S&pell Check"
-msgstr "G&wirio Sillafu"
-
-#: catalogmanager/catalogmanager.cpp:362
-msgid "Spell Check in &Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:365
-msgid "&Rough Translation"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:368
-msgid "Rough Translation in M&arked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:371
-msgid "Mai&l"
-msgstr "Pos&t"
-
-#: catalogmanager/catalogmanager.cpp:374
-msgid "Mail Mar&ked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:378
-msgid "&Pack"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:380
-msgid "Pack &Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:399 kbabel/kbabel.cpp:765
-msgid "&Validation"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:412
-msgid "V&alidation Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:425 catalogmanager/catalogmanager.cpp:451
-msgid "Update"
-msgstr "Diweddaru"
-
-#: catalogmanager/catalogmanager.cpp:427 catalogmanager/catalogmanager.cpp:453
-msgid "Update Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:429 catalogmanager/catalogmanager.cpp:455
-msgid "Commit"
-msgstr "Cyflwyno"
-
-#: catalogmanager/catalogmanager.cpp:431 catalogmanager/catalogmanager.cpp:457
-msgid "Commit Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:433
-msgid "Status"
-msgstr "Cyflwr"
-
-#: catalogmanager/catalogmanager.cpp:435
-msgid "Status for Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:437 catalogmanager/catalogmanager.cpp:467
-msgid "Show Diff"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:459
-#, fuzzy
-msgid "Status (Local)"
-msgstr "Cyflwr:"
-
-#: catalogmanager/catalogmanager.cpp:461
-msgid "Status (Local) for Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:463
-#, fuzzy
-msgid "Status (Remote)"
-msgstr "Cyflwr:"
-
-#: catalogmanager/catalogmanager.cpp:465
-msgid "Status (Remote) for Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:469
-#, fuzzy
-msgid "Show Information"
-msgstr "Gwybodaeth Catalog"
-
-#: catalogmanager/catalogmanager.cpp:471
-msgid "Show Information for Marked"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:488 catalogmanager/catalogmanager.cpp:503
-msgid "Update Templates"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:490 catalogmanager/catalogmanager.cpp:505
-msgid "Update Marked Templates"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:492 catalogmanager/catalogmanager.cpp:507
-msgid "Commit Templates"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:494 catalogmanager/catalogmanager.cpp:509
-msgid "Commit Marked Templates"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:525 catalogmanager/catalogmanager.cpp:529
-msgid "Commands"
-msgstr "Gorchmynion:"
-
-#: 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 ""
-
-#: catalogmanager/catalogmanager.cpp:663 catalogmanager/catalogmanager.cpp:696
-#: catalogmanager/catalogmanager.cpp:727 catalogmanager/catalogmanager.cpp:757
-#: catalogmanager/catalogmanager.cpp:787 catalogmanager/catalogmanager.cpp:807
-#: catalogmanager/catalogmanager.cpp:827
-msgid ""
-"Cannot send a message to KBabel.\n"
-"Please check your installation of TDE."
-msgstr ""
-
-#: 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 ""
-
-#: catalogmanager/catalogmanager.cpp:893
-msgid "Found: 0/0"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:915
-msgid "Found: %1/%2"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:940
-#: catalogmanager/catalogmanager.cpp:1024 kbabel/kbabelview.cpp:4433
-#: kbabeldict/kbabeldictview.cpp:239
-msgid "Searching"
-msgstr "Yn chwilio"
-
-#: catalogmanager/catalogmanager.cpp:986
-#: catalogmanager/catalogmanager.cpp:1073
-msgid "DCOP communication with KBabel failed."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:986
-#: catalogmanager/catalogmanager.cpp:1073
-msgid "DCOP Communication Error"
-msgstr "Gwall Cyfathrebu DCOP"
-
-#: catalogmanager/catalogmanager.cpp:1001
-#: catalogmanager/catalogmanager.cpp:1087
-msgid "KBabel cannot be started."
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:1001
-#: catalogmanager/catalogmanager.cpp:1087
-msgid "Cannot Start KBabel"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:1008
-#: catalogmanager/catalogmanager.cpp:1094
-msgid "Search string not found!"
-msgstr ""
-
-#: catalogmanager/catalogmanager.cpp:1235
-#, c-format
-msgid "Cannot open project file %1"
-msgstr ""
-
-#: datatools/xml/main.cc:60
-msgid ""
-"_: what check found errors\n"
-"XML tags"
-msgstr ""
-
-#: datatools/context/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"context info"
-msgstr ""
-
-#: datatools/arguments/main.cc:57
-msgid ""
-"_: what check found errors\n"
-"arguments"
-msgstr ""
-
-#: datatools/accelerators/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"accelerator"
-msgstr ""
-
-#: datatools/whitespace/main.cc:60
-msgid ""
-"_: which check found errors\n"
-"whitespace only translation"
-msgstr ""
-
-#: datatools/length/main.cc:61 datatools/regexp/main.cc:55
-msgid ""
-"_: which check found errors\n"
-"translation has inconsistent length"
-msgstr ""
-
-#: datatools/pluralforms/main.cc:59
-msgid ""
-"_: what check found errors\n"
-"plural forms"
-msgstr ""
-
-#: datatools/equations/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"equations"
-msgstr ""
-
-#: datatools/regexp/main.cc:58
-msgid "Error loading data (%1)"
-msgstr ""
-
-#: datatools/regexp/main.cc:118
-msgid "File not found"
-msgstr "Ni chanfuwyd y ffeil"
-
-#: datatools/regexp/main.cc:123
-msgid "The file is not a XML"
-msgstr ""
-
-#: datatools/regexp/main.cc:147
-msgid "Expected tag 'item'"
-msgstr ""
-
-#: datatools/regexp/main.cc:153
-msgid "First child of 'item' is not a node"
-msgstr ""
-
-#: datatools/regexp/main.cc:159
-msgid "Expected tag 'name'"
-msgstr ""
-
-#: datatools/regexp/main.cc:167
-msgid "Expected tag 'exp'"
-msgstr ""
-
-#: datatools/not-translated/main.cc:60
-msgid ""
-"_: which check found errors\n"
-"English text in translation"
-msgstr ""
-
-#: datatools/punctuation/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"punctuation"
-msgstr ""
-
-#: _translatorinfo.cpp:1 kbabeldict/main.cpp:121
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3 kbabeldict/main.cpp:122
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: filters/gettext/gettextexport.cpp:74
-msgid "saving file"
-msgstr ""
-
-#: filters/gettext/gettextimport.cpp:83
-msgid "loading file"
-msgstr "llwytho ffeil..."
-
-#: addons/tdefile-plugins/tdefile_po.cpp:50
-msgid "Catalog Information"
-msgstr "Gwybodaeth Catalog"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:53
-msgid "Total Messages"
-msgstr ""
-
-#: addons/tdefile-plugins/tdefile_po.cpp:54
-msgid "Fuzzy Messages"
-msgstr ""
-
-#: addons/tdefile-plugins/tdefile_po.cpp:55
-msgid "Untranslated Messages"
-msgstr ""
-
-#: addons/tdefile-plugins/tdefile_po.cpp:57
-msgid "Language Team"
-msgstr ""
-
-#: addons/tdefile-plugins/tdefile_po.cpp:58
-msgid "Revision"
-msgstr ""
-
-#: common/kbmailer.cpp:106
-#, c-format
-msgid "Error while trying to download file %1."
-msgstr ""
-
-#: common/kbmailer.cpp:145
-msgid "Enter the name of the archive without file extension"
-msgstr ""
-
-#: common/kbmailer.cpp:178
-msgid "Error while trying to create archive file."
-msgstr ""
-
-#: common/kbmailer.cpp:193
-#, c-format
-msgid "Error while trying to read file %1."
-msgstr ""
-
-#: common/kbmailer.cpp:208
-msgid "Error while trying to copy file %1 into archive."
-msgstr ""
-
-#: common/kbproject.cpp:53
-msgid "unnamed"
-msgstr "di-enw"
-
-#: common/catalog.cpp:592
-msgid ""
-"Free Software Foundation Copyright does not contain any year. It will not be "
-"updated."
-msgstr ""
-
-#: common/catalog.cpp:1237
-msgid "validating file"
-msgstr ""
-
-#: common/catalog.cpp:1276
-msgid "applying tool"
-msgstr ""
-
-#: common/catalog.cpp:3128
-msgid "searching matching message"
-msgstr ""
-
-#: common/catalog.cpp:3217
-msgid "preparing messages for diff"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:69
-msgid ""
-"_: Caption of dialog\n"
-"Rough Translation"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:82 kbabeldict/kbabeldictview.cpp:111
-msgid "S&top"
-msgstr "S&topio"
-
-#: commonui/roughtransdlg.cpp:96
-msgid "What to Translate"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:102
-msgid "U&ntranslated entries"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:103
-msgid "&Fuzzy entries"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:104
-msgid "T&ranslated entries"
-msgstr ""
-
-#: 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 ""
-
-#: commonui/roughtransdlg.cpp:113
-msgid "How to Translate"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:118
-msgid "&Use dictionary settings"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:121
-msgid "Fu&zzy translation (slow)"
-msgstr ""
-
-#: commonui/roughtransdlg.cpp:123
-msgid "&Single word translation"
-msgstr ""
-
-#: 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 ""
-
-#: commonui/roughtransdlg.cpp:136
-msgid "&Mark changed entries as fuzzy"
-msgstr ""
-
-#: 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 ""
-
-#: commonui/roughtransdlg.cpp:150
-msgid "Initialize &TDE-specific entries"
-msgstr ""
-
-#: 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 ""
-
-#: commonui/roughtransdlg.cpp:158
-msgid "Dictionaries"
-msgstr ""
-
-#: 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 ""
-
-#: commonui/roughtransdlg.cpp:186
-msgid "Messages:"
-msgstr "Negeseuon :"
-
-#: 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 ""
-
-#: commonui/projectpref.cpp:70
-msgid ""
-"_: title of page in preferences dialog\n"
-"Identity"
-msgstr "Dynodiad"
-
-#: commonui/projectpref.cpp:72
-msgid "Information About You and Translation Team"
-msgstr ""
-
-#: commonui/projectpref.cpp:76 kbabel/kbabelview.cpp:1595
-msgid ""
-"_: title of page in preferences dialog\n"
-"Save"
-msgstr "Cadw"
-
-#: commonui/projectpref.cpp:78 kbabel/kbabelview.cpp:1597
-msgid "Options for File Saving"
-msgstr ""
-
-#: commonui/projectpref.cpp:82
-msgid ""
-"_: title of page in preferences dialog\n"
-"Spelling"
-msgstr "Sillafu"
-
-#: commonui/projectpref.cpp:84
-msgid "Options for Spell Checking"
-msgstr ""
-
-#: commonui/projectpref.cpp:89
-msgid ""
-"_: title of page in preferences dialog\n"
-"Source"
-msgstr "Tarddiad"
-
-#: commonui/projectpref.cpp:91
-msgid "Options for Showing Source Context"
-msgstr ""
-
-#: commonui/projectpref.cpp:96
-msgid ""
-"_: title of page in preferences dialog\n"
-"Miscellaneous"
-msgstr "Amrywiol"
-
-#: commonui/projectpref.cpp:98
-msgid "Miscellaneous Settings"
-msgstr "Gosodiadau Amrywiol"
-
-#: commonui/projectpref.cpp:101
-msgid ""
-"_: title of page in preferences dialog\n"
-"Folders"
-msgstr "Plygyll"
-
-#: commonui/projectpref.cpp:103
-msgid "Paths to Message Catalogs & Catalog Templates"
-msgstr ""
-
-#: commonui/projectpref.cpp:106
-msgid ""
-"_: title of page in preferences dialog\n"
-"Folder Commands"
-msgstr ""
-
-#: commonui/projectpref.cpp:108
-msgid "User-Defined Commands for Folder Items"
-msgstr ""
-
-#: commonui/projectpref.cpp:113
-msgid ""
-"_: title of page in preferences dialog\n"
-"File Commands"
-msgstr ""
-
-#: commonui/projectpref.cpp:115
-msgid "User-Defined Commands for File Items"
-msgstr ""
-
-#: commonui/projectpref.cpp:120
-msgid ""
-"_: title of page in preferences dialog\n"
-"Catalog Manager"
-msgstr ""
-
-#: commonui/projectpref.cpp:122
-msgid "Catalog Manager View Settings"
+#: commonui/context.cpp:97
+msgid "Corresponding source file not found"
 msgstr ""
 
-#: commonui/projectpref.cpp:125 kbabel/kbabelpref.cpp:85
+#: commonui/context.cpp:265 commonui/context.cpp:275 commonui/context.cpp:285
 msgid ""
-"_: title of page in preferences dialog\n"
-"Diff"
-msgstr "Diff"
-
-#: commonui/projectpref.cpp:127
-msgid "Searching for Differences"
+"KBabel cannot start a text editor component.\n"
+"Please check your TDE installation."
 msgstr ""
 
 #: commonui/cmdedit.cpp:51
@@ -1484,32 +33,6 @@ msgstr "Gorchy&myn:"
 msgid "&Add"
 msgstr "&Ychwanegu"
 
-#: commonui/tdeactionselector.cpp:81
-msgid "&Available:"
-msgstr "&Ar gael:"
-
-#: commonui/tdeactionselector.cpp:96
-msgid "&Selected:"
-msgstr "&Wedi'u dewis:"
-
-#: commonui/projectwizard.cpp:78
-msgid "Basic Project Information"
-msgstr ""
-
-#: commonui/projectwizard.cpp:83
-msgid "Translation Files"
-msgstr ""
-
-#: commonui/projectwizard.cpp:140
-msgid ""
-"The file '%1' already exists.\n"
-"Do you want to replace it?"
-msgstr ""
-
-#: commonui/projectwizard.cpp:141
-msgid "File Exists"
-msgstr "Ffeil yn Bodoli"
-
 #: commonui/finddialog.cpp:62
 msgid "&Find:"
 msgstr "&Canfod:"
@@ -1571,7 +94,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./catalogmanager/markpatternwidget.ui line 54
-#: commonui/finddialog.cpp:124 rc.cpp:69
+#: commonui/finddialog.cpp:124 rc.cpp:1219
 #, no-c-format
 msgid "C&ase sensitive"
 msgstr "Mae llythrennau bach/mawr o &bwys"
@@ -1597,7 +120,7 @@ msgid "F&ind backwards"
 msgstr "C&anfod yn ôl"
 
 #. i18n: file ./catalogmanager/markpatternwidget.ui line 86
-#: commonui/finddialog.cpp:133 rc.cpp:81
+#: commonui/finddialog.cpp:133 rc.cpp:1231
 #, no-c-format
 msgid "Use regu&lar expression"
 msgstr ""
@@ -1709,7 +232,7 @@ msgid "No autosave"
 msgstr "Dim hunan-gadw"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 29
-#: commonui/projectprefwidgets.cpp:188 rc.cpp:420
+#: commonui/projectprefwidgets.cpp:188 rc.cpp:271
 #, no-c-format
 msgid "&General"
 msgstr "&Cyffredinol"
@@ -2017,7 +540,7 @@ msgid ""
 "<qt>"
 "<p><b>Marker for keyboard accelerator</b></p>"
 "<p>Define here, what character marks the following character as keyboard "
-"accelerator. For example in Qt it is '&amp;' and in Gtk it is '_'.</p></qt>"
+"accelerator. For example in TQt it is '&amp;' and in Gtk it is '_'.</p></qt>"
 msgstr ""
 
 #: commonui/projectprefwidgets.cpp:693
@@ -2077,13 +600,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 68
-#: commonui/projectprefwidgets.cpp:890 rc.cpp:313
+#: commonui/projectprefwidgets.cpp:890 rc.cpp:199
 #, no-c-format
 msgid "&Base folder of PO files:"
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 110
-#: commonui/projectprefwidgets.cpp:903 rc.cpp:316
+#: commonui/projectprefwidgets.cpp:903 rc.cpp:202
 #, no-c-format
 msgid "Ba&se folder of POT files:"
 msgstr ""
@@ -2263,217 +786,394 @@ msgstr ""
 msgid "Path Patterns"
 msgstr ""
 
-#: commonui/context.cpp:97
-msgid "Corresponding source file not found"
+#: commonui/tdeactionselector.cpp:81
+msgid "&Available:"
+msgstr "&Ar gael:"
+
+#: commonui/tdeactionselector.cpp:96
+msgid "&Selected:"
+msgstr "&Wedi'u dewis:"
+
+#: commonui/projectpref.cpp:70
+msgid ""
+"_: title of page in preferences dialog\n"
+"Identity"
+msgstr "Dynodiad"
+
+#: commonui/projectpref.cpp:72
+msgid "Information About You and Translation Team"
 msgstr ""
 
-#: commonui/context.cpp:265 commonui/context.cpp:275 commonui/context.cpp:285
+#: commonui/projectpref.cpp:76 kbabel/kbabelview.cpp:1595
 msgid ""
-"KBabel cannot start a text editor component.\n"
-"Please check your TDE installation."
+"_: title of page in preferences dialog\n"
+"Save"
+msgstr "Cadw"
+
+#: commonui/projectpref.cpp:78 kbabel/kbabelview.cpp:1597
+msgid "Options for File Saving"
 msgstr ""
 
-#. i18n: file ./kbabel/headerwidget.ui line 24
-#: kbabel/commentview.cpp:78 rc.cpp:414
-#, no-c-format
-msgid "&Comment:"
-msgstr "&Sylwad:"
+#: commonui/projectpref.cpp:82
+msgid ""
+"_: title of page in preferences dialog\n"
+"Spelling"
+msgstr "Sillafu"
 
-#: kbabel/commentview.cpp:88
+#: commonui/projectpref.cpp:84
+msgid "Options for Spell Checking"
+msgstr ""
+
+#: commonui/projectpref.cpp:89
 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>"
+"_: title of page in preferences dialog\n"
+"Source"
+msgstr "Tarddiad"
+
+#: commonui/projectpref.cpp:91
+msgid "Options for Showing Source Context"
 msgstr ""
 
-#: kbabel/contextview.cpp:63
+#: commonui/projectpref.cpp:96
 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>"
+"_: title of page in preferences dialog\n"
+"Miscellaneous"
+msgstr "Amrywiol"
+
+#: commonui/projectpref.cpp:98
+msgid "Miscellaneous Settings"
+msgstr "Gosodiadau Amrywiol"
+
+#: commonui/projectpref.cpp:101
+msgid ""
+"_: title of page in preferences dialog\n"
+"Folders"
+msgstr "Plygyll"
+
+#: commonui/projectpref.cpp:103
+msgid "Paths to Message Catalogs & Catalog Templates"
 msgstr ""
 
-#: kbabel/contextview.cpp:99
-msgid "current entry"
+#: commonui/projectpref.cpp:106
+msgid ""
+"_: title of page in preferences dialog\n"
+"Folder Commands"
 msgstr ""
 
-#: kbabel/contextview.cpp:125 kbabel/kbabel.cpp:721 kbabel/kbabelview.cpp:419
-msgid "untranslated"
+#: commonui/projectpref.cpp:108
+msgid "User-Defined Commands for Folder Items"
 msgstr ""
 
-#: kbabel/contextview.cpp:140
+#: commonui/projectpref.cpp:113
 msgid ""
-"Plural %1: %2\n"
+"_: title of page in preferences dialog\n"
+"File Commands"
 msgstr ""
 
-#: kbabel/errorlistview.cpp:62
-msgid ""
-"<qt>"
-"<p><b>Error List</b></p>"
-"<p>This window shows the list of errors found by validator tools so you can "
-"know why the current message has been marked with an error.</p></qt>"
+#: commonui/projectpref.cpp:115
+msgid "User-Defined Commands for File Items"
 msgstr ""
 
-#: kbabel/kbabelpref.cpp:57
+#: commonui/projectpref.cpp:120
 msgid ""
 "_: title of page in preferences dialog\n"
-"Edit"
-msgstr "Golygu"
+"Catalog Manager"
+msgstr ""
 
-#: kbabel/kbabelpref.cpp:59
-msgid "Options for Editing"
+#: commonui/projectpref.cpp:122
+msgid "Catalog Manager View Settings"
 msgstr ""
 
-#: kbabel/kbabelpref.cpp:70
+#: commonui/projectpref.cpp:125 kbabel/kbabelpref.cpp:85
 msgid ""
 "_: title of page in preferences dialog\n"
-"Search"
-msgstr "Chwilio"
+"Diff"
+msgstr "Diff"
 
-#: kbabel/kbabelpref.cpp:72
-msgid "Options for Searching Similar Translations"
+#: commonui/projectpref.cpp:127
+msgid "Searching for Differences"
 msgstr ""
 
-#: kbabel/kbabelpref.cpp:87
-msgid "Options for Showing Differences"
+#: commonui/roughtransdlg.cpp:69
+msgid ""
+"_: Caption of dialog\n"
+"Rough Translation"
 msgstr ""
 
-#: kbabel/kbabelpref.cpp:90
+#: commonui/roughtransdlg.cpp:82 kbabeldict/kbabeldictview.cpp:111
+msgid "S&top"
+msgstr "S&topio"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:157
+#: catalogmanager/libsvn/svndialog.cpp:152 commonui/roughtransdlg.cpp:83
+msgid "C&ancel"
+msgstr "&Diddymu"
+
+#: commonui/roughtransdlg.cpp:96
+msgid "What to Translate"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:102
+msgid "U&ntranslated entries"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:103
+msgid "&Fuzzy entries"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:104
+msgid "T&ranslated entries"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:108
 msgid ""
-"_: name of page in preferences dialog icon list\n"
-"Fonts"
-msgstr "Wynebfathau"
+"<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 ""
 
-#: kbabel/kbabelpref.cpp:92
+#: commonui/roughtransdlg.cpp:113
+msgid "How to Translate"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:118
+msgid "&Use dictionary settings"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:121
+msgid "Fu&zzy translation (slow)"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:123
+msgid "&Single word translation"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:126
 msgid ""
-"_: title of page in preferences dialog\n"
-"Font Settings"
-msgstr "Gosodiadau Ffont"
+"<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 ""
 
-#: kbabel/kbabelpref.cpp:95
+#: commonui/roughtransdlg.cpp:136
+msgid "&Mark changed entries as fuzzy"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:139
 msgid ""
-"_: name of page in preferences dialog icon list\n"
-"Colors"
-msgstr "Lliwiau"
+"<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 ""
 
-#: kbabel/kbabelpref.cpp:97
+#: commonui/roughtransdlg.cpp:150
+msgid "Initialize &TDE-specific entries"
+msgstr ""
+
+#: commonui/roughtransdlg.cpp:153
 msgid ""
-"_: title of page in preferences dialog\n"
-"Color Settings"
-msgstr "Gosodiadau Lliw"
+"<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 ""
 
-#: kbabel/kbcataloglistview.cpp:44
-msgid "Id"
-msgstr "Dynodiad (Id)"
+#: commonui/roughtransdlg.cpp:158
+msgid "Dictionaries"
+msgstr ""
 
-#: kbabel/kbcataloglistview.cpp:45
-#, fuzzy
-msgid "Original String"
-msgstr "Awdur gwreiddiol"
+#: 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 ""
 
-#. i18n: translators: Dock window caption
-#: kbabel/kbabelview.cpp:456 kbabel/kbcataloglistview.cpp:46
-#, fuzzy
-msgid "Translated String"
-msgstr "Cyfieithiad"
+#: commonui/roughtransdlg.cpp:186
+msgid "Messages:"
+msgstr "Negeseuon :"
 
-#: kbabel/main.cpp:537
-msgid "Go to entry with msgid <msgid>"
+#: 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 ""
 
-#: kbabel/main.cpp:538 kbabeldict/main.cpp:105
-msgid "Disable splashscreen at startup"
+#: catalogmanager/multiroughtransdlg.cpp:143 commonui/roughtransdlg.cpp:685
+msgid "Rough Translation Statistics"
 msgstr ""
 
-#: kbabel/main.cpp:540
-msgid "Files to open"
+#: 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 ""
 
-#: kbabel/main.cpp:547
-msgid "KBabel"
-msgstr "KBabel"
+#: commonui/projectwizard.cpp:78
+msgid "Basic Project Information"
+msgstr ""
 
-#: kbabel/main.cpp:548
-msgid "An advanced PO file editor"
+#: commonui/projectwizard.cpp:83
+msgid "Translation Files"
 msgstr ""
 
-#: kbabel/main.cpp:555
+#: commonui/projectwizard.cpp:140
 msgid ""
-"Wrote the dictionary plugin for searching in a database and some other code."
+"The file '%1' already exists.\n"
+"Do you want to replace it?"
 msgstr ""
 
-#: kbabel/main.cpp:560
-msgid "Bug fixes, KFilePlugin for PO files, CVS support, mailing files"
+#: commonui/projectwizard.cpp:141
+msgid "File Exists"
+msgstr "Ffeil yn Bodoli"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:50
+msgid "Catalog Information"
+msgstr "Gwybodaeth Catalog"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:53
+msgid "Total Messages"
 msgstr ""
 
-#: kbabel/main.cpp:562
-#, fuzzy
-msgid "Translation List View"
-msgstr "Cyfieithiad"
+#: addons/tdefile-plugins/tdefile_po.cpp:54
+msgid "Fuzzy Messages"
+msgstr ""
 
-#: kbabel/main.cpp:574
-msgid "Implemented XML validation/highlighting plus other small fixes."
+#: addons/tdefile-plugins/tdefile_po.cpp:55
+msgid "Untranslated Messages"
 msgstr ""
 
-#: kbabel/main.cpp:583
-msgid "String distance algorithm implementation"
+#: addons/tdefile-plugins/tdefile_po.cpp:56
+#: catalogmanager/catalogmanagerview.cpp:96
+msgid "Last Translator"
 msgstr ""
 
-#: kbabel/main.cpp:585
-msgid "Error list for current entry, regexp data tool"
+#: addons/tdefile-plugins/tdefile_po.cpp:57
+msgid "Language Team"
 msgstr ""
 
-#: kbabel/main.cpp:587
-msgid "Word-by-word string difference algorithm implementation"
+#: addons/tdefile-plugins/tdefile_po.cpp:58
+msgid "Revision"
 msgstr ""
 
-#: kbabel/headereditor.cpp:60
-msgid "&Apply Settings"
+#: _translatorinfo.cpp:1 kbabeldict/main.cpp:121
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3 kbabeldict/main.cpp:122
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: datatools/punctuation/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"punctuation"
 msgstr ""
 
-#: kbabel/headereditor.cpp:61
+#: datatools/whitespace/main.cc:60
 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>"
+"_: which check found errors\n"
+"whitespace only translation"
 msgstr ""
 
-#: kbabel/headereditor.cpp:65
-msgid "&Reset"
-msgstr "&Ailosod"
+#: datatools/equations/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"equations"
+msgstr ""
 
-#: kbabel/headereditor.cpp:66
-msgid "<qt><p>This button will revert all changes made so far.</p></qt>"
+#: datatools/not-translated/main.cc:60
+msgid ""
+"_: which check found errors\n"
+"English text in translation"
 msgstr ""
 
-#: kbabel/headereditor.cpp:111
-#, c-format
-msgid "Header Editor for %1"
+#: datatools/xml/main.cc:60
+msgid ""
+"_: what check found errors\n"
+"XML tags"
 msgstr ""
 
-#: kbabel/headereditor.cpp:136
+#: datatools/accelerators/main.cc:58
 msgid ""
-"<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating!</p></qt>"
+"_: what check found errors\n"
+"accelerator"
 msgstr ""
 
-#: kbabel/headereditor.cpp:172
+#: datatools/length/main.cc:61 datatools/regexp/main.cc:55
 msgid ""
-"<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating.</p></qt>"
+"_: which check found errors\n"
+"translation has inconsistent length"
+msgstr ""
+
+#: datatools/regexp/main.cc:58
+msgid "Error loading data (%1)"
+msgstr ""
+
+#: datatools/regexp/main.cc:118
+msgid "File not found"
+msgstr "Ni chanfuwyd y ffeil"
+
+#: datatools/regexp/main.cc:123
+msgid "The file is not a XML"
+msgstr ""
+
+#: datatools/regexp/main.cc:147
+msgid "Expected tag 'item'"
+msgstr ""
+
+#: datatools/regexp/main.cc:153
+msgid "First child of 'item' is not a node"
+msgstr ""
+
+#: datatools/regexp/main.cc:159
+msgid "Expected tag 'name'"
+msgstr ""
+
+#: datatools/regexp/main.cc:167
+msgid "Expected tag 'exp'"
+msgstr ""
+
+#: datatools/pluralforms/main.cc:59
+msgid ""
+"_: what check found errors\n"
+"plural forms"
+msgstr ""
+
+#: datatools/context/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"context info"
+msgstr ""
+
+#: datatools/arguments/main.cc:57
+msgid ""
+"_: what check found errors\n"
+"arguments"
 msgstr ""
 
 #: kbabel/kbabelview.cpp:185
@@ -2559,6 +1259,10 @@ msgstr ""
 msgid "fuzzy"
 msgstr "niwlaidd"
 
+#: kbabel/contextview.cpp:125 kbabel/kbabel.cpp:721 kbabel/kbabelview.cpp:419
+msgid "untranslated"
+msgstr ""
+
 #: kbabel/kbabel.cpp:725 kbabel/kbabelview.cpp:428
 msgid "faulty"
 msgstr ""
@@ -2582,6 +1286,12 @@ msgid ""
 msgstr ""
 
 #. i18n: translators: Dock window caption
+#: kbabel/kbabelview.cpp:456 kbabel/kbcataloglistview.cpp:46
+#, fuzzy
+msgid "Translated String"
+msgstr "Cyfieithiad"
+
+#. i18n: translators: Dock window caption
 #: kbabel/kbabelview.cpp:466
 msgid ""
 "_: the search (noun)\n"
@@ -2659,6 +1369,15 @@ msgid ""
 "There was an error while reading the file header. Please check the header."
 msgstr ""
 
+#: 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 ""
+
 #: kbabel/kbabelview.cpp:1189 kbabel/kbabelview.cpp:1311
 msgid ""
 "Error while reading the file:\n"
@@ -2704,6 +1423,15 @@ msgid ""
 " %1"
 msgstr ""
 
+#: 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 ""
+
 #: kbabel/kbabelview.cpp:1262
 msgid ""
 "All changes will be lost if the file is reverted to its last saved state."
@@ -2761,6 +1489,15 @@ msgid ""
 "Do you want to save to another file or cancel?"
 msgstr ""
 
+#: catalogmanager/catalogmanagerview.cpp:519 kbabel/kbabelview.cpp:1451
+msgid "The file %1 already exists. Do you want to overwrite it?"
+msgstr "Mae'r ffeil %1 mewn bod yn barod.  Ydych am ysgrifennu drosto?"
+
+#: catalogmanager/catalogmanagerview.cpp:520 kbabel/kbabelview.cpp:1452
+#: kbabel/kbabelview.cpp:1521
+msgid "&Overwrite"
+msgstr "&Trosysgrifo"
+
 #: kbabel/kbabelview.cpp:1482
 msgid ""
 "You have specified a folder:\n"
@@ -2792,6 +1529,11 @@ msgid ""
 "Output of \"msgfmt --statistics\":\n"
 msgstr ""
 
+#: catalogmanager/catalogmanagerview.cpp:845
+#: catalogmanager/catalogmanagerview.cpp:934 kbabel/kbabelview.cpp:1649
+msgid "You can use gettext tools only for checking PO files."
+msgstr ""
+
 #: kbabel/kbabelview.cpp:1658
 msgid ""
 "msgfmt detected a syntax error.\n"
@@ -2926,7 +1668,7 @@ msgid "Spellcheck"
 msgstr "Gwirio Sillafu"
 
 #: kbabel/kbabelview.cpp:3949
-msgid "KBabel cannot start spell checker. Please verify your TDE installation."
+msgid "KBabel cannot start spell checker. Please check your TDE installation."
 msgstr ""
 
 #: kbabel/kbabelview.cpp:3974
@@ -2992,15 +1734,42 @@ msgstr ""
 msgid "The spell checker program seems to have crashed."
 msgstr "Ymddengys bod ISpell wedi chwalu."
 
-#: kbabel/spelldlg.cpp:44
+#: catalogmanager/catalogmanager.cpp:940
+#: catalogmanager/catalogmanager.cpp:1024 kbabel/kbabelview.cpp:4433
+#: kbabeldict/kbabeldictview.cpp:239
+msgid "Searching"
+msgstr "Yn chwilio"
+
+#: kbabel/charselectview.cpp:64 kbabel/kbcharselect.cpp:52
+msgid "Table:"
+msgstr "Tabl:"
+
+#: kbabel/charselectview.cpp:84
 msgid ""
-"_: Caption of dialog\n"
-"Spelling"
-msgstr "Sillafu"
+"<qt>"
+"<p><b>Character Selector</b></p>"
+"<p>This tool allows to insert special characters using double click.</p></qt>"
+msgstr ""
 
-#: kbabel/spelldlg.cpp:47
-msgid "&Spell Check"
-msgstr "&Gwirio Sillafu"
+#: 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 ""
+
+#: kbabel/contextview.cpp:99
+msgid "current entry"
+msgstr ""
+
+#: kbabel/contextview.cpp:140
+msgid ""
+"Plural %1: %2\n"
+msgstr ""
 
 #: kbabel/hidingmsgedit.cpp:76
 msgid "Context inserted by KBabel, do not translate:"
@@ -3011,6 +1780,157 @@ msgstr ""
 msgid "Plural %1"
 msgstr ""
 
+#: kbabel/kbabelpref.cpp:57
+msgid ""
+"_: title of page in preferences dialog\n"
+"Edit"
+msgstr "Golygu"
+
+#: kbabel/kbabelpref.cpp:59
+msgid "Options for Editing"
+msgstr ""
+
+#: kbabel/kbabelpref.cpp:70
+msgid ""
+"_: title of page in preferences dialog\n"
+"Search"
+msgstr "Chwilio"
+
+#: kbabel/kbabelpref.cpp:72
+msgid "Options for Searching Similar Translations"
+msgstr ""
+
+#: kbabel/kbabelpref.cpp:87
+msgid "Options for Showing Differences"
+msgstr ""
+
+#: kbabel/kbabelpref.cpp:90
+msgid ""
+"_: name of page in preferences dialog icon list\n"
+"Fonts"
+msgstr "Wynebfathau"
+
+#: kbabel/kbabelpref.cpp:92
+msgid ""
+"_: title of page in preferences dialog\n"
+"Font Settings"
+msgstr "Gosodiadau Ffont"
+
+#: kbabel/kbabelpref.cpp:95
+msgid ""
+"_: name of page in preferences dialog icon list\n"
+"Colors"
+msgstr "Lliwiau"
+
+#: kbabel/kbabelpref.cpp:97
+msgid ""
+"_: title of page in preferences dialog\n"
+"Color Settings"
+msgstr "Gosodiadau Lliw"
+
+#: kbabel/kbcataloglistview.cpp:44
+msgid "Id"
+msgstr "Dynodiad (Id)"
+
+#: kbabel/kbcataloglistview.cpp:45
+#, fuzzy
+msgid "Original String"
+msgstr "Awdur gwreiddiol"
+
+#: 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 ""
+
+#: kbabel/kbabelview2.cpp:624
+msgid "No difference found"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:628
+msgid "Difference found"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:636
+msgid "No corresponding message found."
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:641
+msgid "No corresponding message found"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:696
+msgid "Select File to Diff With"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:710
+msgid "loading file for diff"
+msgstr ""
+
+#: 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 ""
+
+#: kbabel/kbabelview2.cpp:810
+msgid "Do not show in this find/replace session again"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:825
+msgid "Enter new package for the current file:"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:1021
+msgid ""
+"Total words: %1\n"
+"\n"
+"Words in untranslated messages: %2\n"
+"\n"
+"Words in fuzzy messages: %3"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:1024
+msgid "Word Count"
+msgstr ""
+
+#. i18n: file ./kbabel/headerwidget.ui line 24
+#: kbabel/commentview.cpp:78 rc.cpp:265
+#, no-c-format
+msgid "&Comment:"
+msgstr "&Sylwad:"
+
+#: 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 ""
+
+#: catalogmanager/catalogmanager.cpp:129 kbabel/kbabel.cpp:132
+#: kbabel/kbabel.cpp:150 kbabel/kbabel.cpp:1754
+#, c-format
+msgid ""
+"Cannot open project file\n"
+"%1"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:130 kbabel/kbabel.cpp:133
+#: kbabel/kbabel.cpp:151 kbabel/kbabel.cpp:1755
+#, fuzzy
+msgid "Project File Error"
+msgstr "Gwall &Blaenorol"
+
 #: kbabel/kbabel.cpp:330
 msgid ""
 "You have not run KBabel before. To allow KBabel to work correctly you must "
@@ -3104,6 +2024,38 @@ msgstr ""
 msgid "&Last Entry"
 msgstr ""
 
+#: catalogmanager/catalogmanager.cpp:299 kbabel/kbabel.cpp:528
+msgid "P&revious Fuzzy or Untranslated"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:296 kbabel/kbabel.cpp:531
+msgid "N&ext Fuzzy or Untranslated"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:293 kbabel/kbabel.cpp:534
+msgid "Pre&vious Fuzzy"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:290 kbabel/kbabel.cpp:537
+msgid "Ne&xt Fuzzy"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:287 kbabel/kbabel.cpp:540
+msgid "Prev&ious Untranslated"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:284 kbabel/kbabel.cpp:543
+msgid "Nex&t Untranslated"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:306 kbabel/kbabel.cpp:546
+msgid "Previo&us Error"
+msgstr "Gwall &Blaenorol"
+
+#: catalogmanager/catalogmanager.cpp:303 kbabel/kbabel.cpp:549
+msgid "Next Err&or"
+msgstr "Gwall Ne&saf"
+
 #: kbabel/kbabel.cpp:552
 msgid "&Back in History"
 msgstr ""
@@ -3132,6 +2084,18 @@ msgstr ""
 msgid "About Dictionary"
 msgstr ""
 
+#: catalogmanager/catalogmanager.cpp:331 kbabel/kbabel.cpp:594
+msgid "&New..."
+msgstr "&Newydd..."
+
+#: catalogmanager/catalogmanager.cpp:339 kbabel/kbabel.cpp:602
+msgid "C&lose"
+msgstr "C&au"
+
+#: catalogmanager/catalogmanager.cpp:345 kbabel/kbabel.cpp:607
+msgid "&Configure..."
+msgstr "&Ffurfweddu..."
+
 #: kbabel/kbabel.cpp:614
 msgid "&Spell Check..."
 msgstr "&Gwirio Sillafu ..."
@@ -3160,6 +2124,11 @@ msgstr ""
 msgid "&Diffmode"
 msgstr ""
 
+#: catalogmanager/libcvs/cvsdialog.cpp:358
+#: catalogmanager/libsvn/svndialog.cpp:337 kbabel/kbabel.cpp:642
+msgid "&Show Diff"
+msgstr ""
+
 #: kbabel/kbabel.cpp:645
 msgid "S&how Original Text"
 msgstr ""
@@ -3184,6 +2153,10 @@ msgstr ""
 msgid "&Word Count"
 msgstr ""
 
+#: catalogmanager/catalogmanager.cpp:243 kbabel/kbabel.cpp:674
+msgid "&Stop Searching"
+msgstr ""
+
 #: kbabel/kbabel.cpp:678
 msgid "&Gettext Info"
 msgstr ""
@@ -3213,7 +2186,7 @@ msgid "Untranslated: 0"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 75
-#: kbabel/kbabel.cpp:713 rc.cpp:803
+#: kbabel/kbabel.cpp:713 rc.cpp:924
 #, no-c-format
 msgid "Status: "
 msgstr "Cyflwr:"
@@ -3240,6 +2213,10 @@ msgid ""
 "shown.</p></qt>"
 msgstr ""
 
+#: catalogmanager/catalogmanager.cpp:399 kbabel/kbabel.cpp:765
+msgid "&Validation"
+msgstr ""
+
 #: kbabel/kbabel.cpp:767
 msgid "Perform &All Checks"
 msgstr ""
@@ -3306,209 +2283,177 @@ msgid ""
 "Spellcheck Done"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:538
-#, c-format
+#: kbabel/errorlistview.cpp:62
 msgid ""
-"An error occurred while trying to get the list of messages for this file from "
-"the database:\n"
-"%1"
+"<qt>"
+"<p><b>Error List</b></p>"
+"<p>This window shows the list of errors found by validator tools so you can "
+"know why the current message has been marked with an error.</p></qt>"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:624
-msgid "No difference found"
+#: kbabel/gotodialog.cpp:41 kbabel/gotodialog.cpp:43
+msgid "Go to Entry"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:628
-msgid "Difference found"
+#: kbabel/headereditor.cpp:60
+msgid "&Apply Settings"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:636
-msgid "No corresponding message found."
+#: kbabel/headereditor.cpp:61
+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>"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:641
-msgid "No corresponding message found"
+#: kbabel/headereditor.cpp:65
+msgid "&Reset"
+msgstr "&Ailosod"
+
+#: kbabel/headereditor.cpp:66
+msgid "<qt><p>This button will revert all changes made so far.</p></qt>"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:696
-msgid "Select File to Diff With"
+#: kbabel/headereditor.cpp:111
+#, c-format
+msgid "Header Editor for %1"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:710
-msgid "loading file for diff"
+#: 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 ""
 
-#: kbabel/kbabelview2.cpp:801
+#: kbabel/headereditor.cpp:172
 msgid ""
-"The search string has not been found yet.\n"
-"However, the string might be found in the files being searched at the moment.\n"
-"Please try later."
+"<qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating.</p></qt>"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:810
-msgid "Do not show in this find/replace session again"
+#: kbabel/spelldlg.cpp:44
+msgid ""
+"_: Caption of dialog\n"
+"Spelling"
+msgstr "Sillafu"
+
+#: kbabel/spelldlg.cpp:47
+msgid "&Spell Check"
+msgstr "&Gwirio Sillafu"
+
+#: kbabel/main.cpp:537
+msgid "Go to entry with msgid <msgid>"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:825
-msgid "Enter new package for the current file:"
+#: kbabel/main.cpp:538 kbabeldict/main.cpp:105
+msgid "Disable splashscreen at startup"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:1021
-msgid ""
-"Total words: %1\n"
-"\n"
-"Words in untranslated messages: %2\n"
-"\n"
-"Words in fuzzy messages: %3"
+#: catalogmanager/main.cpp:178 kbabel/main.cpp:539
+msgid "File to load configuration from"
 msgstr ""
 
-#: kbabel/kbabelview2.cpp:1024
-msgid "Word Count"
+#: kbabel/main.cpp:540
+msgid "Files to open"
 msgstr ""
 
-#: kbabel/charselectview.cpp:64 kbabel/kbcharselect.cpp:52
-msgid "Table:"
-msgstr "Tabl:"
+#: kbabel/main.cpp:547
+msgid "KBabel"
+msgstr "KBabel"
 
-#: 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>"
+#: kbabel/main.cpp:548
+msgid "An advanced PO file editor"
 msgstr ""
 
-#: kbabel/gotodialog.cpp:41 kbabel/gotodialog.cpp:43
-msgid "Go to Entry"
+#: catalogmanager/main.cpp:188 kbabel/main.cpp:549
+msgid "(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"
 msgstr ""
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 11
-#: rc.cpp:6 rc.cpp:331
-#, no-c-format
-msgid "&Go"
-msgstr "&Ewch"
+#: catalogmanager/main.cpp:190 kbabel/main.cpp:551 kbabeldict/main.cpp:118
+msgid "Original author"
+msgstr "Awdur gwreiddiol"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 30
-#: rc.cpp:9
-#, no-c-format
-msgid "&Markings"
+#: catalogmanager/main.cpp:202 kbabel/main.cpp:553
+msgid "Wrote diff algorithm, fixed KSpell and gave a lot of useful hints."
 msgstr ""
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 43
-#: rc.cpp:12 rc.cpp:334
-#, no-c-format
-msgid "&Project"
-msgstr "&Cywaith"
-
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 60
-#: rc.cpp:18 rc.cpp:36 rc.cpp:42
-#, no-c-format
-msgid "CVS"
+#: kbabel/main.cpp:555
+msgid ""
+"Wrote the dictionary plugin for searching in a database and some other code."
 msgstr ""
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 122
-#: rc.cpp:30 rc.cpp:358
-#, no-c-format
-msgid "Main"
-msgstr "Prif"
+#: catalogmanager/main.cpp:191 kbabel/main.cpp:558
+#, fuzzy
+msgid "Current maintainer, porting to KDE3/Qt3."
+msgstr "Cynhaliwr cyfredol"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 128
-#: rc.cpp:33 rc.cpp:361
-#, no-c-format
-msgid "Navigationbar"
+#: kbabel/main.cpp:560
+msgid "Bug fixes, KFilePlugin for PO files, CVS support, mailing files"
 msgstr ""
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 38
-#: kbabeldict/kbabeldictbox.cpp:208 rc.cpp:48
-#, no-c-format
-msgid "Current:"
-msgstr "Cyfredol:"
+#: kbabel/main.cpp:562
+#, fuzzy
+msgid "Translation List View"
+msgstr "Cyfieithiad"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 59
-#: rc.cpp:51
-#, no-c-format
-msgid "Overall:"
-msgstr ""
+#: catalogmanager/main.cpp:193 kbabel/main.cpp:564 kbabeldict/main.cpp:119
+msgid "Current maintainer"
+msgstr "Cynhaliwr cyfredol"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 80
-#: rc.cpp:54
-#, no-c-format
-msgid "Current file:"
+#: catalogmanager/main.cpp:195 kbabel/main.cpp:566
+msgid ""
+"Wrote documentation and sent many bug reports and suggestions for improvements."
 msgstr ""
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 88
-#: rc.cpp:57
-#, no-c-format
-msgid "Validation:"
+#: 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 ""
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 96
-#: rc.cpp:60 rc.cpp:143 rc.cpp:740
-#, no-c-format
-msgid "New Item"
-msgstr "Eitem Newydd"
+#: catalogmanager/main.cpp:204 kbabel/main.cpp:572
+msgid ""
+"Helped keep KBabel up to date with the KDE API and gave a lot of other help."
+msgstr ""
 
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 24
-#: rc.cpp:63
-#, no-c-format
-msgid "To be set dynamically:"
+#: kbabel/main.cpp:574
+msgid "Implemented XML validation/highlighting plus other small fixes."
 msgstr ""
 
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 62
-#: rc.cpp:72
-#, no-c-format
-msgid "&Include templates"
+#: catalogmanager/main.cpp:206 kbabel/main.cpp:576
+msgid "Various validation plugins."
 msgstr ""
 
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 70
-#: rc.cpp:75
-#, no-c-format
-msgid "Use &wildcards"
+#: catalogmanager/main.cpp:209 kbabel/main.cpp:579
+msgid "Sponsored development of KBabel for a while."
 msgstr ""
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 32
-#: rc.cpp:84
-#, no-c-format
-msgid "Mark invalid as &fuzzy"
+#: catalogmanager/main.cpp:214 kbabel/main.cpp:581
+msgid "KBabel contains code from TQt"
 msgstr ""
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 39
-#: rc.cpp:87
-#, no-c-format
-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>"
+#: kbabel/main.cpp:583
+msgid "String distance algorithm implementation"
 msgstr ""
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 47
-#: rc.cpp:94
-#, no-c-format
-msgid "&Do not validate fuzzy"
+#: kbabel/main.cpp:585
+msgid "Error list for current entry, regexp data tool"
 msgstr ""
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 52
-#: rc.cpp:97
-#, 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>"
+#: kbabel/main.cpp:587
+msgid "Word-by-word string difference algorithm implementation"
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 25
-#: rc.cpp:102
+#: rc.cpp:3
 #, no-c-format
 msgid "Diff Source"
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 41
-#: rc.cpp:105
+#: rc.cpp:6
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3529,31 +2474,31 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 52
-#: rc.cpp:121
+#: rc.cpp:22
 #, no-c-format
 msgid "Use &file"
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 60
-#: rc.cpp:124
+#: rc.cpp:25
 #, no-c-format
 msgid "Use messages from &translation database"
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 68
-#: rc.cpp:127
+#: rc.cpp:28
 #, no-c-format
 msgid "Use &msgstr from the same file"
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 86
-#: rc.cpp:130
+#: rc.cpp:31
 #, no-c-format
 msgid "Base folder for diff files:"
 msgstr ""
 
 #. i18n: file ./commonui/diffpreferences.ui line 104
-#: rc.cpp:133
+#: rc.cpp:34
 #, no-c-format
 msgid ""
 "<qt><q><b>Base folder for diff files</b></q>\n"
@@ -3566,20 +2511,8 @@ msgid ""
 "the database are used for diffing.</p></qt>"
 msgstr ""
 
-#. i18n: file ./commonui/tdelisteditor.ui line 151
-#: rc.cpp:152
-#, no-c-format
-msgid "Up"
-msgstr "I fyny"
-
-#. i18n: file ./commonui/tdelisteditor.ui line 162
-#: rc.cpp:155
-#, no-c-format
-msgid "Down"
-msgstr "I Lawr"
-
 #. i18n: file ./commonui/projectwizardwidget.ui line 38
-#: rc.cpp:158
+#: rc.cpp:44
 #, no-c-format
 msgid ""
 "<font size=\"+1\">Welcome to Project Wizard!</font>\n"
@@ -3599,7 +2532,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 66
-#: rc.cpp:174 rc.cpp:251
+#: rc.cpp:60 rc.cpp:137
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -3611,13 +2544,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 74
-#: rc.cpp:181
+#: rc.cpp:67
 #, no-c-format
 msgid "&Language:"
 msgstr "&Iaith:"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 86
-#: rc.cpp:184 rc.cpp:206
+#: rc.cpp:70 rc.cpp:92
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -3631,13 +2564,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 97
-#: rc.cpp:193
+#: rc.cpp:79
 #, no-c-format
 msgid "Project &name:"
 msgstr "Enw'r cy&waith:"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 110
-#: rc.cpp:196 rc.cpp:238
+#: rc.cpp:82 rc.cpp:124
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3653,13 +2586,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 135
-#: rc.cpp:215
+#: rc.cpp:101
 #, no-c-format
 msgid "Project &type:"
 msgstr "Math y c&ywaith:"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 158
-#: rc.cpp:218 rc.cpp:270
+#: rc.cpp:104 rc.cpp:156
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -3672,7 +2605,7 @@ msgid ""
 "</p>\n"
 "<p>Currently known types:\n"
 "<ul>\n"
-"<li><b>TDE</b>: K Desktop Environment Internalization project</li>\n"
+"<li><b>TDE</b>: Trinity Desktop Environment Internalization project</li>\n"
 "<li><b>GNOME</b>: GNOME Translation project</li>\n"
 "<li><b>Translation Robot</b>: Translation Project Robot</li>\n"
 "<li><b>Other</b>: Other kind of project. No tuning will be\n"
@@ -3683,37 +2616,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 184
-#: rc.cpp:248
+#: rc.cpp:134
 #, no-c-format
 msgid "Configuration &file name:"
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 200
-#: rc.cpp:258
+#: rc.cpp:144
 #, no-c-format
 msgid "TDE"
 msgstr "TDE"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 205
-#: rc.cpp:261
+#: rc.cpp:147
 #, no-c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 210
-#: rc.cpp:264
+#: rc.cpp:150
 #, no-c-format
 msgid "Translation Project Robot"
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 215
-#: rc.cpp:267
+#: rc.cpp:153
 #, no-c-format
 msgid "Other"
 msgstr "Arall"
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 18
-#: rc.cpp:290
+#: rc.cpp:176
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3724,7 +2657,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 44
-#: rc.cpp:295
+#: rc.cpp:181
 #, no-c-format
 msgid ""
 "<font size=\"+1\">The Translation Files</font>\n"
@@ -3746,143 +2679,125 @@ msgid ""
 "will not work."
 msgstr ""
 
-#. i18n: file ./kbabel/fontpreferences.ui line 25
-#: rc.cpp:319
+#. i18n: file ./commonui/tdelisteditor.ui line 94
+#: rc.cpp:205 rc.cpp:861 rc.cpp:1246
 #, no-c-format
-msgid "Font for Messages"
-msgstr ""
+msgid "New Item"
+msgstr "Eitem Newydd"
 
-#. i18n: file ./kbabel/fontpreferences.ui line 36
-#: rc.cpp:322
+#. i18n: file ./commonui/tdelisteditor.ui line 151
+#: rc.cpp:214
 #, no-c-format
-msgid "&Show only fixed font"
-msgstr ""
+msgid "Up"
+msgstr "I fyny"
 
-#. i18n: file ./kbabel/kbabelui.rc line 58
-#: rc.cpp:340
+#. i18n: file ./commonui/tdelisteditor.ui line 162
+#: rc.cpp:217
 #, no-c-format
-msgid "&Spelling"
-msgstr "&Sillafu"
+msgid "Down"
+msgstr "I Lawr"
 
-#. i18n: file ./kbabel/kbabelui.rc line 68
-#: rc.cpp:343
+#. i18n: file ./kbabel/spelldlgwidget.ui line 24
+#: rc.cpp:220
 #, no-c-format
-msgid "D&iff"
-msgstr "D&iff"
+msgid "Choose What You Want to Spell Check"
+msgstr ""
 
-#. i18n: file ./kbabel/kbabelui.rc line 82
-#: rc.cpp:346
+#. i18n: file ./kbabel/spelldlgwidget.ui line 30
+#: rc.cpp:223 rc.cpp:235
 #, no-c-format
-msgid "&Dictionaries"
+msgid "Spell check only the current message."
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 41
-#: rc.cpp:364
+#. i18n: file ./kbabel/spelldlgwidget.ui line 41
+#: rc.cpp:226
 #, no-c-format
-msgid "&Background color:"
-msgstr "Lliw'r &cefndir:"
+msgid "A&ll messages"
+msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 52
-#: rc.cpp:367
+#. i18n: file ./kbabel/spelldlgwidget.ui line 44
+#: rc.cpp:229
 #, no-c-format
-msgid "Color for &quoted characters:"
+msgid "Spell check all translated messages of this file."
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 63
-#: rc.cpp:370
+#. i18n: file ./kbabel/spelldlgwidget.ui line 52
+#: rc.cpp:232
 #, no-c-format
-msgid "Color for &syntax errors:"
+msgid "C&urrent message only"
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 82
-#: rc.cpp:373
+#. i18n: file ./kbabel/spelldlgwidget.ui line 66
+#: rc.cpp:238
 #, no-c-format
-msgid "Color for s&pellcheck errors:"
+msgid "Fro&m beginning of current message to end of file"
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 97
-#: rc.cpp:376
+#. i18n: file ./kbabel/spelldlgwidget.ui line 74
+#: rc.cpp:241
 #, no-c-format
-msgid ""
-"<qt>Here you can setup a color to display identified <b>mispelled</b> "
-"words and\n"
-"phrases.</qt>"
+msgid "&From beginning of file to cursor position"
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 105
-#: rc.cpp:380
+#. i18n: file ./kbabel/spelldlgwidget.ui line 77
+#: rc.cpp:244
 #, no-c-format
-msgid "Color for &keyboard accelerators:"
+msgid ""
+"Spell check all text from the beginning of the file to the current cursor "
+"position."
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 132
-#: rc.cpp:383
+#. i18n: file ./kbabel/spelldlgwidget.ui line 85
+#: rc.cpp:247
 #, no-c-format
-msgid "Color for c-for&mat characters:"
+msgid "F&rom cursor position to end of file"
 msgstr ""
 
-#. i18n: file ./kbabel/colorpreferences.ui line 151
-#: rc.cpp:386
+#. i18n: file ./kbabel/spelldlgwidget.ui line 88
+#: rc.cpp:250
 #, no-c-format
-msgid "Color for &tags:"
+msgid ""
+"Spell check all text from the current cursor position to the end of the file."
 msgstr ""
 
-#. i18n: file ./kbabel/searchpreferences.ui line 39
-#: rc.cpp:389
+#. i18n: file ./kbabel/spelldlgwidget.ui line 96
+#: rc.cpp:253
 #, no-c-format
-msgid "Au&tomatically start search"
+msgid "S&elected text only"
 msgstr ""
 
-#. i18n: file ./kbabel/searchpreferences.ui line 49
-#: rc.cpp:392
+#. i18n: file ./kbabel/spelldlgwidget.ui line 99
+#: rc.cpp:256
 #, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Automatically start search</b></p>\n"
-"<p>If this is activated, the search is automatically started \n"
-"whenever you switch to another entry in the editor. You can \n"
-"choose where to search with the combo box <b>Default Dictionary</b>.\n"
-"</p>"
-"<p>You can also start searching manually by choosing an entry in \n"
-"the popup menu that appears either when clicking \n"
-"<b>Dictionaries->Find...</b> or keeping the dictionary button \n"
-"in the toolbar pressed for a while.</p></qt>"
+msgid "Spell check only the selected text."
 msgstr ""
 
-#. i18n: file ./kbabel/searchpreferences.ui line 65
-#: rc.cpp:402
+#. i18n: file ./kbabel/spelldlgwidget.ui line 109
+#: rc.cpp:259
 #, no-c-format
-msgid "D&efault dictionary:"
+msgid "U&se this selection as default"
 msgstr ""
 
-#. i18n: file ./kbabel/searchpreferences.ui line 82
-#: rc.cpp:405
+#. i18n: file ./kbabel/spelldlgwidget.ui line 112
+#: rc.cpp:262
 #, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Default Dictionary</b></p>\n"
-"<p>Choose here where to search as default. \n"
-"This setting is used when searching is started automatically \n"
-"or when pressing the dictionary button in the toolbar.</p>\n"
-"<p>You can configure the different dictionaries by selecting \n"
-"the desired dictionary from <b>Settings->Configure Dictionary</b>.\n"
-"</p></qt>"
+msgid "Check this, to store the current selection as default selection."
 msgstr ""
 
 #. i18n: file ./kbabel/headerwidget.ui line 43
-#: rc.cpp:417
+#: rc.cpp:268
 #, no-c-format
 msgid "&Header:"
 msgstr "P&ennawd :"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 54
-#: rc.cpp:423
+#: rc.cpp:274
 #, no-c-format
 msgid "A&utomatically unset fuzzy status"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 60
-#: rc.cpp:426
+#: rc.cpp:277
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3894,13 +2809,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 68
-#: rc.cpp:432
+#: rc.cpp:283
 #, no-c-format
 msgid "Use cle&ver editing"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 79
-#: rc.cpp:435
+#: rc.cpp:286
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3916,13 +2831,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 89
-#: rc.cpp:446
+#: rc.cpp:297
 #, no-c-format
 msgid "Automatic Checks"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 97
-#: rc.cpp:449
+#: rc.cpp:300
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3935,55 +2850,55 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 113
-#: rc.cpp:457
+#: rc.cpp:308
 #, no-c-format
 msgid "&Beep on error"
 msgstr "&Canu ar gwall"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 121
-#: rc.cpp:460
+#: rc.cpp:311
 #, no-c-format
 msgid "Change te&xt color on error"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 150
-#: rc.cpp:463
+#: rc.cpp:314
 #, no-c-format
 msgid "A&ppearance"
 msgstr "&Golwg"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 175
-#: rc.cpp:466
+#: rc.cpp:317
 #, no-c-format
 msgid "H&ighlight syntax"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 183
-#: rc.cpp:469
+#: rc.cpp:320
 #, no-c-format
 msgid "Highlight backgrou&nd"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 191
-#: rc.cpp:472
+#: rc.cpp:323
 #, no-c-format
 msgid "Mark &whitespaces with points"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 199
-#: rc.cpp:475
+#: rc.cpp:326
 #, no-c-format
 msgid "&Show surrounding quotes"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 209
-#: rc.cpp:478
+#: rc.cpp:329
 #, no-c-format
 msgid "Status LEDs"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 213
-#: rc.cpp:481
+#: rc.cpp:332
 #, no-c-format
 msgid ""
 "<qt>"
@@ -3993,978 +2908,1520 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 224
-#: rc.cpp:485
+#: rc.cpp:336
 #, no-c-format
 msgid "Display in stat&usbar"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 232
-#: rc.cpp:488
+#: rc.cpp:339
 #, no-c-format
 msgid "Display in edi&tor"
 msgstr ""
 
 #. i18n: file ./kbabel/editorpreferences.ui line 260
-#: rc.cpp:491 rc.cpp:512
+#: rc.cpp:342 rc.cpp:363
 #, no-c-format
 msgid "Colo&r:"
 msgstr "Lliw&:"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 36
-#: rc.cpp:497
+#: rc.cpp:348
 #, no-c-format
 msgid "Added Characters"
 msgstr ""
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 44
-#: rc.cpp:500
+#: rc.cpp:351
 #, no-c-format
 msgid "Ho&w to display:"
 msgstr ""
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 55
-#: rc.cpp:503
+#: rc.cpp:354
 #, no-c-format
 msgid "Co&lor:"
 msgstr "&Lliw:"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 66
-#: rc.cpp:506
+#: rc.cpp:357
 #, no-c-format
 msgid "Removed Characters"
 msgstr ""
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 74
-#: rc.cpp:509
+#: rc.cpp:360
 #, no-c-format
 msgid "How &to display:"
 msgstr ""
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 94
-#: rc.cpp:515 rc.cpp:521
+#: rc.cpp:366 rc.cpp:372
 #, no-c-format
 msgid "Highlighted"
 msgstr ""
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 99
-#: rc.cpp:518
+#: rc.cpp:369
 #, no-c-format
 msgid "Underlined"
 msgstr "Wedi'i Danllinellu"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 129
-#: rc.cpp:524
+#: rc.cpp:375
 #, no-c-format
 msgid "Stroked Out"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 24
-#: rc.cpp:527
+#. i18n: file ./kbabel/colorpreferences.ui line 41
+#: rc.cpp:378
 #, no-c-format
-msgid "Choose What You Want to Spell Check"
+msgid "&Background color:"
+msgstr "Lliw'r &cefndir:"
+
+#. i18n: file ./kbabel/colorpreferences.ui line 52
+#: rc.cpp:381
+#, no-c-format
+msgid "Color for &quoted characters:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 30
-#: rc.cpp:530 rc.cpp:542
+#. i18n: file ./kbabel/colorpreferences.ui line 63
+#: rc.cpp:384
 #, no-c-format
-msgid "Spell check only the current message."
+msgid "Color for &syntax errors:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 41
-#: rc.cpp:533
+#. i18n: file ./kbabel/colorpreferences.ui line 82
+#: rc.cpp:387
 #, no-c-format
-msgid "A&ll messages"
+msgid "Color for s&pellcheck errors:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 44
-#: rc.cpp:536
+#. i18n: file ./kbabel/colorpreferences.ui line 97
+#: rc.cpp:390
 #, no-c-format
-msgid "Spell check all translated messages of this file."
+msgid ""
+"<qt>Here you can setup a color to display identified <b>mispelled</b> "
+"words and\n"
+"phrases.</qt>"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 52
-#: rc.cpp:539
+#. i18n: file ./kbabel/colorpreferences.ui line 105
+#: rc.cpp:394
 #, no-c-format
-msgid "C&urrent message only"
+msgid "Color for &keyboard accelerators:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 66
-#: rc.cpp:545
+#. i18n: file ./kbabel/colorpreferences.ui line 132
+#: rc.cpp:397
 #, no-c-format
-msgid "Fro&m beginning of current message to end of file"
+msgid "Color for c-for&mat characters:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 74
-#: rc.cpp:548
+#. i18n: file ./kbabel/colorpreferences.ui line 151
+#: rc.cpp:400
 #, no-c-format
-msgid "&From beginning of file to cursor position"
+msgid "Color for &tags:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 77
-#: rc.cpp:551
+#. i18n: file ./kbabel/kbabelui.rc line 29
+#: rc.cpp:409 rc.cpp:1171
 #, no-c-format
-msgid ""
-"Spell check all text from the beginning of the file to the current cursor "
-"position."
+msgid "&Go"
+msgstr "&Ewch"
+
+#. i18n: file ./kbabel/kbabelui.rc line 50
+#: rc.cpp:412 rc.cpp:1177
+#, no-c-format
+msgid "&Project"
+msgstr "&Cywaith"
+
+#. i18n: file ./kbabel/kbabelui.rc line 58
+#: rc.cpp:418
+#, no-c-format
+msgid "&Spelling"
+msgstr "&Sillafu"
+
+#. 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 ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 85
-#: rc.cpp:554
+#. i18n: file ./kbabel/kbabelui.rc line 100
+#: rc.cpp:436 rc.cpp:1195
 #, no-c-format
-msgid "F&rom cursor position to end of file"
+msgid "Main"
+msgstr "Prif"
+
+#. i18n: file ./kbabel/kbabelui.rc line 113
+#: rc.cpp:439 rc.cpp:1198
+#, no-c-format
+msgid "Navigationbar"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 88
-#: rc.cpp:557
+#. i18n: file ./kbabel/searchpreferences.ui line 39
+#: rc.cpp:442
+#, no-c-format
+msgid "Au&tomatically start search"
+msgstr ""
+
+#. i18n: file ./kbabel/searchpreferences.ui line 49
+#: rc.cpp:445
 #, no-c-format
 msgid ""
-"Spell check all text from the current cursor position to the end of the file."
+"<qt>"
+"<p><b>Automatically start search</b></p>\n"
+"<p>If this is activated, the search is automatically started \n"
+"whenever you switch to another entry in the editor. You can \n"
+"choose where to search with the combo box <b>Default Dictionary</b>.\n"
+"</p>"
+"<p>You can also start searching manually by choosing an entry in \n"
+"the popup menu that appears either when clicking \n"
+"<b>Dictionaries->Find...</b> or keeping the dictionary button \n"
+"in the toolbar pressed for a while.</p></qt>"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 96
-#: rc.cpp:560
+#. i18n: file ./kbabel/searchpreferences.ui line 65
+#: rc.cpp:455
 #, no-c-format
-msgid "S&elected text only"
+msgid "D&efault dictionary:"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 99
-#: rc.cpp:563
+#. i18n: file ./kbabel/searchpreferences.ui line 82
+#: rc.cpp:458
 #, no-c-format
-msgid "Spell check only the selected text."
+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 ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 109
-#: rc.cpp:566
+#. i18n: file ./kbabel/fontpreferences.ui line 25
+#: rc.cpp:467
 #, no-c-format
-msgid "U&se this selection as default"
+msgid "Font for Messages"
 msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 112
-#: rc.cpp:569
+#. i18n: file ./kbabel/fontpreferences.ui line 36
+#: rc.cpp:470
 #, no-c-format
-msgid "Check this, to store the current selection as default selection."
+msgid "&Show only fixed font"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 30
-#: rc.cpp:572 rc.cpp:602
+#: rc.cpp:473 rc.cpp:503
 #, no-c-format
 msgid "&Path to Compendium File"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 85
-#: rc.cpp:578 rc.cpp:611
+#: rc.cpp:479 rc.cpp:512
 #, no-c-format
 msgid "Onl&y whole words"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 93
-#: rc.cpp:581 rc.cpp:614
+#: rc.cpp:482 rc.cpp:515
 #, no-c-format
 msgid "Case sensiti&ve"
 msgstr "Llythrennau &mawr/bach o bwys"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 103
-#: rc.cpp:584 rc.cpp:617
+#: rc.cpp:485 rc.cpp:518
 #, no-c-format
 msgid "A text matches if:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 125
-#: rc.cpp:587 rc.cpp:620
+#: rc.cpp:488 rc.cpp:521
 #, no-c-format
 msgid "E&qual to searched text"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 133
-#: rc.cpp:590 rc.cpp:623
+#: rc.cpp:491 rc.cpp:524
 #, no-c-format
 msgid "Contains a &word of searched text"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 141
-#: rc.cpp:593 rc.cpp:626
+#: rc.cpp:494 rc.cpp:527
 #, no-c-format
 msgid "Co&ntained in searched text"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 149
-#: rc.cpp:596 rc.cpp:629
+#: rc.cpp:497 rc.cpp:530
 #, no-c-format
 msgid "&Similar to searched text"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 157
-#: rc.cpp:599 rc.cpp:632
+#: rc.cpp:500 rc.cpp:533
 #, no-c-format
 msgid "Contains searched te&xt"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 102
-#: rc.cpp:608
+#: rc.cpp:509
 #, no-c-format
 msgid "Ignore &fuzzy strings"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 28
-#: rc.cpp:635
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 39
+#: rc.cpp:536
 #, no-c-format
-msgid "General"
-msgstr "Cyffredinol"
+msgid "&Path to auxiliary file:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 61
+#: rc.cpp:539
+#, no-c-format
+msgid "&Ignore fuzzy entries"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 78
+#: rc.cpp:542
+#, no-c-format
+msgid ""
+"<qt>"
+"<p>\n"
+"The following variables will be replaced in the path if available:\n"
+"<ul>\n"
+"<li><b>@PACKAGE@</b>: the name of the currently translated application or "
+"package</li>\n"
+"<li><b>@LANG@</b>: the language code</li>\n"
+"<li><b>@DIR<em>n</em>@</b>: where n is a positive integer. This expands to the "
+"nth folder counted from the filename</li>\n"
+"</ul></p></qt>"
+msgstr ""
+
+#. 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 "Generig"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 55
+#: rc.cpp:554 rc.cpp:966
+#, no-c-format
+msgid "Search Mode"
+msgstr ""
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 77
+#: rc.cpp:560 rc.cpp:972
+#, no-c-format
+msgid ""
+"<qml>Scroll the whole database and return everything that matches \n"
+"according to the rules defined in tabs <strong> Generic </strong>\n"
+"and <strong>Match</strong>"
+msgstr ""
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 92
+#: rc.cpp:568 rc.cpp:980
+#, no-c-format
+msgid ""
+"<qml>Search in a list of <em>good keys</em> (see <strong>Good keys</strong> "
+"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 ""
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 103
+#: rc.cpp:575 rc.cpp:987
+#, no-c-format
+msgid ""
+"<qml>Returns the whole <em>good keys</em> list. Rules defined in <strong>"
+"Search</strong> tab are ignored."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 113
+#: rc.cpp:578 rc.cpp:990
+#, no-c-format
+msgid "Case sensitive"
+msgstr "Llythrennau mawr/bach o bwys"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 116
+#: rc.cpp:581 rc.cpp:993
+#, no-c-format
+msgid ""
+"<qml>If it is checked the search will be case sensitive. It is ignored if you "
+"use <em>Return the list of \"good keys\"</em> search mode."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 124
+#: rc.cpp:584 rc.cpp:996
+#, no-c-format
+msgid "Normalize white space"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 131
+#: rc.cpp:587 rc.cpp:999
+#, no-c-format
+msgid ""
+"Remove white spaces at the beginning and at the end of the phrase.\n"
+"It also substitutes groups of more than one space character with only one space "
+"character."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 139
+#: rc.cpp:591 rc.cpp:1003
+#, no-c-format
+msgid "Remove context comment"
+msgstr ""
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 167
+#: rc.cpp:597 rc.cpp:1009
+#, no-c-format
+msgid "Character to be ignored:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 209
+#: rc.cpp:600 rc.cpp:1012
+#, no-c-format
+msgid "Search"
+msgstr "Chwilio"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 226
+#: rc.cpp:603 rc.cpp:1015
+#, no-c-format
+msgid "Matching Method"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 277
+#: rc.cpp:606 rc.cpp:1018
+#, no-c-format
+msgid "Query is contained"
+msgstr ""
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 288
+#: rc.cpp:612 rc.cpp:1024
+#, no-c-format
+msgid "Query contains"
+msgstr ""
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 299
+#: rc.cpp:618 rc.cpp:1030
+#, no-c-format
+msgid "Normal text"
+msgstr "Testun arferol"
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 313
+#: rc.cpp:624 rc.cpp:1036
+#, no-c-format
+msgid "Equal"
+msgstr "Yn gyfartal i"
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 347
+#: rc.cpp:630 rc.cpp:1042
+#, no-c-format
+msgid "Regular expression"
+msgstr "Mynegiad rheolaidd"
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 360
+#: rc.cpp:636 rc.cpp:1048
+#, no-c-format
+msgid "Word Substitution"
+msgstr ""
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 399
+#: rc.cpp:644 rc.cpp:1056
+#, no-c-format
+msgid "Use one word substitution"
+msgstr ""
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 455
+#: rc.cpp:650 rc.cpp:1062
+#, no-c-format
+msgid "Use two word substitution"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 488
+#: rc.cpp:656 rc.cpp:1068
+#, no-c-format
+msgid "[A-Za-z0-9_%"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 506
+#: rc.cpp:659 rc.cpp:1071
+#, no-c-format
+msgid "]"
+msgstr ""
+
+#. 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 ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 39
-#: rc.cpp:638 rc.cpp:956 rc.cpp:1161
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 553
+#: rc.cpp:665 rc.cpp:759 rc.cpp:1077
 #, no-c-format
 msgid "Database"
 msgstr "Cronfa ddata"
 
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 570
+#: rc.cpp:668 rc.cpp:1080
+#, no-c-format
+msgid "Database folder:"
+msgstr ""
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 592
+#: rc.cpp:674 rc.cpp:1086
+#, no-c-format
+msgid ""
+"Automatically add an entry to the database if a new translation is notified by "
+"someone (may be kbabel)"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 614
+#: rc.cpp:677 rc.cpp:1089
+#, no-c-format
+msgid "Auto added entry author:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 622
+#: rc.cpp:680 rc.cpp:1092
+#, no-c-format
+msgid ""
+"<qml>Put here the name and email address that you want to use as <em>"
+"last translator</em> filed when you auto-add entry to the database (e.g. when "
+"you modify a translation with kbabel)."
+"<p>"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 632
+#: rc.cpp:683
+#, no-c-format
+msgid "Scan Single PO File..."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 640
+#: rc.cpp:686
+#, no-c-format
+msgid "Scan Folder..."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 648
+#: rc.cpp:689
+#, no-c-format
+msgid "Scan Folder && Subfolders..."
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 670
+#: rc.cpp:692 rc.cpp:1104
+#, no-c-format
+msgid "Scanning file:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 678
+#: rc.cpp:695 rc.cpp:1107
+#, no-c-format
+msgid "Entries added:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 719
+#: rc.cpp:698 rc.cpp:1110
+#, no-c-format
+msgid "Total progress:"
+msgstr "Cyfanswm cynnydd :"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 727
+#: rc.cpp:701 rc.cpp:1113
+#, no-c-format
+msgid "Processing file:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 763
+#: rc.cpp:704 rc.cpp:1116
+#, no-c-format
+msgid "Loading file:"
+msgstr "Llwytho ffeil:"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 776
+#: rc.cpp:707 rc.cpp:1119
+#, no-c-format
+msgid "Export..."
+msgstr "Allforio..."
+
+#. 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 "Ystadegau"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 795
+#: rc.cpp:713 rc.cpp:1125
+#, no-c-format
+msgid "Repeated Strings"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 805
+#: rc.cpp:716 rc.cpp:1128
+#, no-c-format
+msgid "Good Keys"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 829
+#: rc.cpp:722 rc.cpp:1134
+#, no-c-format
+msgid ""
+"<qml>Here you can define how to fill the <em>good keys list</em>."
+"<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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 918
+#: rc.cpp:741 rc.cpp:1153
+#, no-c-format
+msgid "Max list length:"
+msgstr ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 942
+#: rc.cpp:744 rc.cpp:1156
+#, no-c-format
+msgid "Frequent Words"
+msgstr ""
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 967
+#: rc.cpp:750 rc.cpp:1162
+#, no-c-format
+msgid "/10000"
+msgstr ""
+
+#. 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 ""
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 28
+#: rc.cpp:756
+#, no-c-format
+msgid "General"
+msgstr "Cyffredinol"
+
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 50
-#: rc.cpp:641
+#: rc.cpp:762
 #, no-c-format
 msgid "DB folder:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 63
-#: rc.cpp:644
+#: rc.cpp:765
 #, no-c-format
 msgid "Automatic update in kbabel"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 73
-#: rc.cpp:647
+#: rc.cpp:768
 #, no-c-format
 msgid "New Entries"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 84
-#: kbabeldict/kbabeldictbox.cpp:1268 rc.cpp:650
+#: kbabeldict/kbabeldictbox.cpp:1268 rc.cpp:771
 #, no-c-format
 msgid "Author:"
 msgstr "Awdur:"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 92
-#: rc.cpp:653
+#: rc.cpp:774
 #, no-c-format
 msgid "From kbabel"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 126
-#: rc.cpp:656
+#: rc.cpp:777
 #, no-c-format
 msgid "Algorithm"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 137
-#: rc.cpp:659
+#: rc.cpp:780
 #, no-c-format
 msgid "Minimum score:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 176
-#: rc.cpp:662
+#: rc.cpp:783
 #, no-c-format
 msgid "Algorithms to Use"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 187
-#: rc.cpp:665 rc.cpp:668 rc.cpp:686 rc.cpp:689 rc.cpp:692 rc.cpp:695
-#: rc.cpp:698
+#: 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 "Sgôr :"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 213
-#: rc.cpp:671
+#: rc.cpp:792
 #, no-c-format
 msgid "Fuzzy sentence archive"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 221
-#: rc.cpp:674
+#: rc.cpp:795
 #, no-c-format
 msgid "Glossary"
 msgstr "Geirfa"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 229
-#: rc.cpp:677
+#: rc.cpp:798
 #, no-c-format
 msgid "Exact "
 msgstr "Union "
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 252
-#: rc.cpp:680
+#: rc.cpp:801
 #, no-c-format
 msgid "Sentence by sentence"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 260
-#: rc.cpp:683
+#: rc.cpp:804
 #, no-c-format
 msgid "Alphanumeric"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 313
-#: rc.cpp:701
+#: rc.cpp:822
 #, no-c-format
 msgid "Word by word"
 msgstr "Fesul gair"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 321
-#: rc.cpp:704
+#: rc.cpp:825
 #, no-c-format
 msgid "Dynamic dictionary"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 336
-#: rc.cpp:707
+#: rc.cpp:828
 #, no-c-format
 msgid "Preferred number of results:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 356
-#: rc.cpp:710
+#: rc.cpp:831
 #, no-c-format
 msgid "Output"
 msgstr "Allbwn"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 367
-#: rc.cpp:713
+#: rc.cpp:834
 #, no-c-format
 msgid "Output Processing"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 395
-#: rc.cpp:716
+#: rc.cpp:837
 #, no-c-format
 msgid "First capital letter match"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 403
-#: rc.cpp:719
+#: rc.cpp:840
 #, no-c-format
 msgid "All capital letter match"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 411
-#: rc.cpp:722
+#: rc.cpp:843
 #, no-c-format
 msgid "Accelerator symbol (&&)"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 419
-#: rc.cpp:725
+#: rc.cpp:846
 #, no-c-format
 msgid "Try to use same letter"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 429
-#: rc.cpp:728
+#: rc.cpp:849
 #, no-c-format
 msgid "Custom Rules"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 440
-#: rc.cpp:731
+#: rc.cpp:852
 #, no-c-format
 msgid "Original string regexp:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 451
-#: rc.cpp:734
+#: rc.cpp:855
 #, no-c-format
 msgid "Enabled"
 msgstr "Alluogir"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 462
-#: rc.cpp:737
+#: rc.cpp:858
 #, no-c-format
 msgid "Description"
 msgstr "Disgrifiad"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 527
-#: rc.cpp:749
+#: rc.cpp:870
 #, no-c-format
 msgid "Replace string:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 545
-#: rc.cpp:752
+#: rc.cpp:873
 #, no-c-format
 msgid "Translated regexp(search):"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 583
-#: rc.cpp:761
+#: rc.cpp:882
 #, no-c-format
 msgid "Check language"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 599
-#: rc.cpp:764
+#: rc.cpp:885
 #, no-c-format
 msgid "Use current filters"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 615
-#: rc.cpp:767
+#: rc.cpp:888
 #, no-c-format
 msgid "Set date to today"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 624
-#: rc.cpp:770
+#: rc.cpp:891
 #, no-c-format
 msgid "Sources"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 651
-#: rc.cpp:779
+#: rc.cpp:900
 #, no-c-format
 msgid "Scan Now"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 684
-#: rc.cpp:785
+#: rc.cpp:906
 #, no-c-format
 msgid "Scan All"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 701
-#: rc.cpp:788
+#: rc.cpp:909
 #, no-c-format
 msgid "Filters"
 msgstr "Hidlenni"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 16
-#: rc.cpp:791
+#: rc.cpp:912
 #, no-c-format
 msgid "Edit Source"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 60
-#: rc.cpp:800
+#: rc.cpp:921
 #, no-c-format
 msgid "Additional Informations"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 133
-#: rc.cpp:806
+#: rc.cpp:927
 #, no-c-format
 msgid "Project name:"
 msgstr "Enw'r cywaith:"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 149
-#: rc.cpp:809
+#: rc.cpp:930
 #, no-c-format
 msgid "Project keywords:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 158
-#: rc.cpp:812
+#: rc.cpp:933
 #, no-c-format
 msgid "General Info"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 172
-#: rc.cpp:815
+#: rc.cpp:936
 #, no-c-format
 msgid "Single File"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 177
-#: rc.cpp:818
+#: rc.cpp:939
 #, no-c-format
 msgid "Single Folder"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 182
-#: rc.cpp:821
+#: rc.cpp:942
 #, no-c-format
 msgid "Recursive Folder"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 194
-#: rc.cpp:824
+#: rc.cpp:945
 #, no-c-format
 msgid "Source name:"
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 207
-#: rc.cpp:827
+#: rc.cpp:948
 #, no-c-format
 msgid "Type:"
 msgstr "Math:"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 215
-#: rc.cpp:830
+#: rc.cpp:951
 #, no-c-format
 msgid "Setup Filter..."
 msgstr ""
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 223
-#: rc.cpp:833
+#: rc.cpp:954
 #, no-c-format
 msgid "Location:"
 msgstr "Lleoliad:"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 231
-#: rc.cpp:836
+#: rc.cpp:957
 #, no-c-format
 msgid "Use filter"
 msgstr "Defnyddiwch hidlen"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 17
-#: rc.cpp:839
+#: rc.cpp:960
 #, no-c-format
 msgid "DBSEPrefWidget"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 41
-#: rc.cpp:842 rc.cpp:1010 rc.cpp:1047 rc.cpp:1215
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 635
+#: rc.cpp:1095
 #, no-c-format
-msgid "Generic"
-msgstr "Generig"
+msgid "Scan Single PO File"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 58
-#: rc.cpp:845 rc.cpp:1050
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 643
+#: rc.cpp:1098
 #, no-c-format
-msgid "Search Mode"
+msgid "Scan Folder"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 75
-#: rc.cpp:848 rc.cpp:1053
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 651
+#: rc.cpp:1101
 #, no-c-format
-msgid "Search in whole database (slow)"
+msgid "Scan Folder && Subfolders"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 80
-#: rc.cpp:851 rc.cpp:1056
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 30
+#: rc.cpp:1174
 #, no-c-format
-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>"
+msgid "&Markings"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 88
-#: rc.cpp:856 rc.cpp:1061
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 60
+#: rc.cpp:1183 rc.cpp:1201 rc.cpp:1207
 #, no-c-format
-msgid "Search in list of \"good keys\" (best)"
+msgid "CVS"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 95
-#: rc.cpp:859 rc.cpp:1064
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 78
+#: catalogmanager/future.cpp:4 rc.cpp:1186 rc.cpp:1204 rc.cpp:1210
 #, 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."
+msgid "SVN"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 103
-#: rc.cpp:863 rc.cpp:1068
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 24
+#: rc.cpp:1213
 #, no-c-format
-msgid "Return the list of \"good keys\" (fast)"
+msgid "To be set dynamically:"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 106
-#: rc.cpp:866 rc.cpp:1071
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 62
+#: rc.cpp:1222
 #, no-c-format
-msgid ""
-"<qml>Returns the whole <em>good keys</em> list. Rules defined in <strong>"
-"Search</strong> tab are ignored."
+msgid "&Include templates"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 116
-#: rc.cpp:869 rc.cpp:1074
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 70
+#: rc.cpp:1225
 #, no-c-format
-msgid "Case sensitive"
-msgstr "Llythrennau mawr/bach o bwys"
+msgid "Use &wildcards"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 119
-#: rc.cpp:872 rc.cpp:1077
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 38
+#: kbabeldict/kbabeldictbox.cpp:208 rc.cpp:1234
 #, 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 ""
+msgid "Current:"
+msgstr "Cyfredol:"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 127
-#: rc.cpp:875 rc.cpp:1080
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 59
+#: rc.cpp:1237
 #, no-c-format
-msgid "Normalize white space"
+msgid "Overall:"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 134
-#: rc.cpp:878 rc.cpp:1083
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 80
+#: rc.cpp:1240
 #, 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."
+msgid "Current file:"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 142
-#: rc.cpp:882 rc.cpp:1087
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 88
+#: rc.cpp:1243
 #, no-c-format
-msgid "Remove context comment"
+msgid "Validation:"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 148
-#: rc.cpp:885 rc.cpp:1090
+#. i18n: file ./catalogmanager/validationoptions.ui line 32
+#: rc.cpp:1249
 #, no-c-format
-msgid "Remove, if exists, the _:comment"
+msgid "Mark invalid as &fuzzy"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 170
-#: rc.cpp:888 rc.cpp:1093
+#. i18n: file ./catalogmanager/validationoptions.ui line 39
+#: rc.cpp:1252
 #, no-c-format
-msgid "Character to be ignored:"
+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>"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 212
-#: rc.cpp:891 rc.cpp:1096
+#. i18n: file ./catalogmanager/validationoptions.ui line 47
+#: rc.cpp:1259
 #, no-c-format
-msgid "Search"
-msgstr "Chwilio"
+msgid "&Do not validate fuzzy"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 229
-#: rc.cpp:894 rc.cpp:1099
+#. i18n: file ./catalogmanager/validationoptions.ui line 52
+#: rc.cpp:1262
 #, no-c-format
-msgid "Matching Method"
+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 ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 280
-#: rc.cpp:897 rc.cpp:1102
-#, no-c-format
-msgid "Query is contained"
+#: kbabeldict/aboutmoduledlg.cpp:42
+msgid "Report Bug..."
+msgstr "Anfon adroddiad nam..."
+
+#: kbabeldict/kbabeldictview.cpp:83
+msgid "Search in module:"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 283
-#: rc.cpp:900 rc.cpp:1105
-#, no-c-format
-msgid "Match if query is contained in database string"
+#: kbabeldict/kbabeldictview.cpp:106
+msgid "&Start Search"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 291
-#: rc.cpp:903 rc.cpp:1108
-#, no-c-format
-msgid "Query contains"
+#: kbabeldict/kbabeldictview.cpp:108
+msgid "Sea&rch in translations"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 294
-#: rc.cpp:906 rc.cpp:1111
-#, no-c-format
-msgid "Match if query contains the database string"
+#: kbabeldict/kbabeldictview.cpp:125
+msgid "Settings:"
+msgstr "Gosodiadau :"
+
+#: kbabeldict/modules/tmx/pc_factory.cpp:95
+#: kbabeldict/modules/tmx/tmxcompendium.cpp:175
+msgid "TMX Compendium"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 302
-#: rc.cpp:909 rc.cpp:1114
-#, no-c-format
-msgid "Normal text"
-msgstr "Testun arferol"
+#: kbabeldict/modules/pocompendium/compendiumdata.cpp:79
+#: kbabeldict/modules/pocompendium/pocompendium.cpp:1195
+#: kbabeldict/modules/tmx/tmxcompendium.cpp:957
+msgid "Loading PO compendium"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 308
-#: rc.cpp:912 rc.cpp:1117
-#, no-c-format
-msgid "Consider the search string as normal text."
+#: 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 ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 316
-#: rc.cpp:915 rc.cpp:1120
-#, no-c-format
-msgid "Equal"
-msgstr "Yn gyfartal i"
+#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:96
+#: kbabeldict/modules/tmx/preferenceswidget.cpp:94
+msgid ""
+"<qt>"
+"<p><b>Comparison Options</b></p>"
+"<p>Choose here which messages you want to have treated as a matching "
+"message.</p></qt>"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 325
-#: rc.cpp:918 rc.cpp:1123
-#, no-c-format
-msgid "Match if query and database string are equal"
+#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:104
+#: kbabeldict/modules/tmx/preferenceswidget.cpp:102
+msgid ""
+"<qt>"
+"<p><b>3-Gram-matching</b></p>"
+"<p>A message matches another if most of its 3-letter groups are contained in "
+"the other message. e.g. 'abc123' matches 'abcx123c12'.</p></qt>"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 350
-#: rc.cpp:921 rc.cpp:1126
-#, no-c-format
-msgid "Regular expression"
-msgstr "Mynegiad rheolaidd"
+#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:109
+#: kbabeldict/modules/tmx/preferenceswidget.cpp:107
+msgid ""
+"<qt>"
+"<p><b>Location</b></p>"
+"<p>Configure here which file is to be used for searching.</p></qt>"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 353
-#: rc.cpp:924 rc.cpp:1129
-#, no-c-format
-msgid "Consider the search string as a regular expression"
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:80
+msgid "Loading TMX compendium"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 363
-#: rc.cpp:927 rc.cpp:1132
-#, no-c-format
-msgid "Word Substitution"
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:92
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:102
+msgid "Cannot open the file."
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 368
-#: rc.cpp:930 rc.cpp:1135
-#, no-c-format
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:96
+msgid "Cannot parse XML data."
+msgstr ""
+
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:111
+msgid "Unsupported format."
+msgstr ""
+
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:117
 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>."
+"Error while trying to read file for TMX Compendium module:\n"
+"%1\n"
+"Reason: %2"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 402
-#: rc.cpp:935 rc.cpp:1140
-#, no-c-format
-msgid "Use one word substitution"
+#: kbabeldict/modules/pocompendium/compendiumdata.cpp:104
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:132
+msgid "Building indices"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 433
-#: rc.cpp:938 rc.cpp:944 rc.cpp:1143 rc.cpp:1149
-#, no-c-format
-msgid "Max number of words in the query:"
+#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:229
+msgid "Empty database."
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 458
-#: rc.cpp:941 rc.cpp:1146
-#, no-c-format
-msgid "Use two word substitution"
+#: kbabeldict/modules/tmx/pc_factory.cpp:97
+msgid "A module for searching in a TMX file"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 491
-#: rc.cpp:947 rc.cpp:1152
-#, no-c-format
-msgid "[A-Za-z0-9_%"
+#: kbabeldict/modules/pocompendium/pc_factory.cpp:95
+#: kbabeldict/modules/pocompendium/pocompendium.cpp:184
+msgid "PO Compendium"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 509
-#: rc.cpp:950 rc.cpp:1155
-#, no-c-format
-msgid "]"
+#: kbabeldict/modules/pocompendium/compendiumdata.cpp:93
+#, c-format
+msgid ""
+"Error while trying to read file for PO Compendium module:\n"
+"%1"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 519
-#: rc.cpp:953 rc.cpp:1158
-#, no-c-format
-msgid "Local characters for regular expressions:"
+#: 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 ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 573
-#: rc.cpp:959 rc.cpp:1164
-#, no-c-format
-msgid "Database folder:"
+#: kbabeldict/modules/pocompendium/pc_factory.cpp:97
+msgid "A module for searching in a PO file"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 589
-#: rc.cpp:962 rc.cpp:1167
-#, no-c-format
-msgid "Auto add entry to database"
+#: kbabeldict/modules/poauxiliary/pa_factory.cpp:95
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:147
+msgid "PO Auxiliary"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 595
-#: rc.cpp:965 rc.cpp:1170
-#, no-c-format
-msgid ""
-"Automatically add an entry to the database if a new translation is notified by "
-"someone (may be kbabel)"
+#: kbabeldict/modules/poauxiliary/pa_factory.cpp:97
+msgid "A simple module for exact searching in a PO file"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 617
-#: rc.cpp:968 rc.cpp:1173
-#, no-c-format
-msgid "Auto added entry author:"
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:426
+msgid "Loading PO auxiliary"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 625
-#: rc.cpp:971 rc.cpp:1176
-#, no-c-format
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:438
+#, 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>"
+"Error while trying to open file for PO Auxiliary module:\n"
+"%1"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 635
-#: rc.cpp:974
-#, no-c-format
-msgid "Scan Single PO File"
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:450
+msgid "Building index"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 643
-#: rc.cpp:977
-#, no-c-format
-msgid "Scan Folder"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1412
+#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:67
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:68
+msgid "Translation Database"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 651
-#: rc.cpp:980
-#, no-c-format
-msgid "Scan Folder && Subfolders"
+#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:69
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:70
+msgid "A fast translation search engine based on databases"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 673
-#: rc.cpp:983 rc.cpp:1188
-#, no-c-format
-msgid "Scanning file:"
+#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:71
+msgid "Copyright 2000-2001 by Andrea Rizzi"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 681
-#: rc.cpp:986 rc.cpp:1191
-#, no-c-format
-msgid "Entries added:"
+#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:102
+#, c-format
+msgid "Scanning file: %1"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 722
-#: rc.cpp:989 rc.cpp:1194
-#, no-c-format
-msgid "Total progress:"
-msgstr "Cyfanswm cynnydd :"
+#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:107
+#, c-format
+msgid "Entries added: %1"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 730
-#: rc.cpp:992 rc.cpp:1197
-#, no-c-format
-msgid "Processing file:"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:84
+msgid "No error"
+msgstr "Dim gwall"
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:125
+msgid ""
+"Database folder does not exist:\n"
+"%1\n"
+"Do you want to create it now?"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 766
-#: rc.cpp:995 rc.cpp:1200
-#, no-c-format
-msgid "Loading file:"
-msgstr "Llwytho ffeil:"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
+msgid "Create Folder"
+msgstr "Creu Plygell"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 779
-#: rc.cpp:998 rc.cpp:1203
-#, no-c-format
-msgid "Export..."
-msgstr "Allforio..."
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Do Not Create"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 798
-#: rc.cpp:1004 rc.cpp:1209
-#, no-c-format
-msgid "Repeated Strings"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:146
+#, c-format
+msgid "It was not possible to create folder %1"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 808
-#: rc.cpp:1007 rc.cpp:1212
-#, no-c-format
-msgid "Good Keys"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:176
+msgid ""
+"<p>There are backup database files from previous versions of KBabel. However, "
+"another version of KBabel (probably from KDE 3.1.1 or 3.1.2) created a new "
+"database. As a result, your KBabel installation contains two versions of "
+"database files. Unfortunatelly, the old and new version can not be merged. You "
+"need to choose one of them."
+"<br/>"
+"<br/>If you choose the old version, the new one will be removed. If you choose "
+"the new version, the old database files will be left alone and you need to "
+"remove them manually. Otherwise this message will be displayed again (the old "
+"files are at $TDEHOME/share/apps/kbabeldict/dbsearchengine/*,old).</p>"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 832
-#: rc.cpp:1013 rc.cpp:1218
-#, no-c-format
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:185
+msgid "Old Database Found"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:186
+msgid "Use &Old Database"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:187
+msgid "Use &New Database"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
 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."
+"Database files not found.\n"
+"Do you want to create them now?"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 849
-#: rc.cpp:1020 rc.cpp:1225
-#, no-c-format
-msgid "Minimum number of words of the key also in the query (%):"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Create"
+msgstr "Creu"
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:408
+msgid "Cannot open the database"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 874
-#: rc.cpp:1023 rc.cpp:1029 rc.cpp:1228 rc.cpp:1234
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:431
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:640
+msgid "Another search has already been started"
+msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 888
-#: rc.cpp:1026 rc.cpp:1231
-#, no-c-format
-msgid "Minimum number of query words in the key (%):"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:438
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:647
+msgid "Unable to search now: a PO file scan is in progress"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 921
-#: rc.cpp:1032 rc.cpp:1237
-#, no-c-format
-msgid "Max list length:"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:445
+msgid "Unable to open the database"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 945
-#: rc.cpp:1035 rc.cpp:1240
-#, no-c-format
-msgid "Frequent Words"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:451
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:658
+msgid "Database empty"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 962
-#: rc.cpp:1038 rc.cpp:1243
-#, no-c-format
-msgid "Discard words more frequent than:"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:462
+msgid "No entry for this package in the database."
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 970
-#: rc.cpp:1041 rc.cpp:1246
-#, no-c-format
-msgid "/10000"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:469
+msgid "Searching for %1 in database"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 987
-#: rc.cpp:1044 rc.cpp:1249
-#, no-c-format
-msgid "Frequent words are considered as in every key"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:548
+msgid "Looking for repetitions"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 632
-#: rc.cpp:1179
-#, no-c-format
-msgid "Scan Single PO File..."
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:562
+msgid "Minimum Repetition"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 640
-#: rc.cpp:1182
-#, no-c-format
-msgid "Scan Folder..."
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:564
+msgid "Insert the minimum number of repetitions for a string:"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 648
-#: rc.cpp:1185
-#, no-c-format
-msgid "Scan Folder && Subfolders..."
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:572
+msgid "Searching repeated string"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 39
-#: rc.cpp:1252
-#, no-c-format
-msgid "&Path to auxiliary file:"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1240
+msgid "Select Folder to Scan Recursively"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 61
-#: rc.cpp:1255
-#, no-c-format
-msgid "&Ignore fuzzy entries"
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1263
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1315
+#, c-format
+msgid "Scanning folder %1"
+msgstr "Yn sganio plygell %1"
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1299
+msgid "Select Folder to Scan"
 msgstr ""
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 78
-#: rc.cpp:1258
-#, no-c-format
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1358
+msgid "Select PO File to Scan"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1372
+#, c-format
+msgid "Scanning file %1"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1608
+msgid "Searching words"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1850
+msgid "Process output"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:72
+msgid "Copyright 2000-2003 by Andrea Rizzi"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:562
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:614
 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>"
+"The name you chose is already used.\n"
+"Please change the source name."
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:563
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:615
+msgid "Name is Not Unique"
+msgstr ""
+
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+#, fuzzy
+msgid "Create Database"
+msgstr "Cronfa ddata"
+
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:182
+msgid "CHUNK BY CHUNK"
+msgstr ""
+
+#: 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 ""
+
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:374
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:386
+msgid "DYNAMIC DICT:"
+msgstr ""
+
+#: 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 ""
+
+#: kbabeldict/kbabeldict.cpp:45
+msgid "KBabelDict"
+msgstr ""
+
+#: kbabeldict/kbabeldict.cpp:47
+msgid "About Module"
+msgstr ""
+
+#: kbabeldict/kbabeldict.cpp:48 kbabeldict/kbabeldict.cpp:104
+msgid "Hide Sett&ings"
+msgstr ""
+
+#: kbabeldict/kbabeldict.cpp:108
+msgid "Show Sett&ings"
 msgstr ""
 
 #: kbabeldict/kbabeldictbox.cpp:201
@@ -5061,6 +4518,30 @@ msgid ""
 "appears not to be installed on your system."
 msgstr ""
 
+#: kbabeldict/dictchooser.cpp:59
+msgid ""
+"_: dictionary to not use\n"
+"Do not use:"
+msgstr ""
+
+#: kbabeldict/dictchooser.cpp:62
+msgid ""
+"_: dictionary to use\n"
+"Use:"
+msgstr "Defnydd :"
+
+#: kbabeldict/dictchooser.cpp:84
+msgid "Move &Up"
+msgstr "Symud i &Fyny"
+
+#: kbabeldict/dictchooser.cpp:87
+msgid "Move &Down"
+msgstr "Symud i &Lawr"
+
+#: kbabeldict/dictchooser.cpp:90
+msgid "Con&figure..."
+msgstr "Ffurf&weddu..."
+
 #: kbabeldict/main.cpp:114
 msgid "KBabel - Dictionary"
 msgstr "KBabel - Geiriadur"
@@ -5073,409 +4554,930 @@ msgstr ""
 msgid "(c) 2000,2001,2002,2003 The KBabeldict developers"
 msgstr ""
 
-#: kbabeldict/modules/tmx/pc_factory.cpp:95
-#: kbabeldict/modules/tmx/tmxcompendium.cpp:175
-msgid "TMX Compendium"
+#: common/catalog.cpp:592
+msgid ""
+"Free Software Foundation Copyright does not contain any year. It will not be "
+"updated."
 msgstr ""
 
-#: kbabeldict/modules/tmx/pc_factory.cpp:97
-msgid "A module for searching in a TMX file"
+#: common/catalog.cpp:1237
+msgid "validating file"
 msgstr ""
 
-#: 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>"
+#: common/catalog.cpp:1276
+msgid "applying tool"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:96
-#: kbabeldict/modules/tmx/preferenceswidget.cpp:94
+#: common/catalog.cpp:3128
+msgid "searching matching message"
+msgstr ""
+
+#: common/catalog.cpp:3217
+msgid "preparing messages for diff"
+msgstr ""
+
+#: common/kbproject.cpp:53
+msgid "unnamed"
+msgstr "di-enw"
+
+#: common/kbmailer.cpp:106
+#, c-format
+msgid "Error while trying to download file %1."
+msgstr ""
+
+#: common/kbmailer.cpp:145
+msgid "Enter the name of the archive without file extension"
+msgstr ""
+
+#: common/kbmailer.cpp:178
+msgid "Error while trying to create archive file."
+msgstr ""
+
+#: common/kbmailer.cpp:193
+#, c-format
+msgid "Error while trying to read file %1."
+msgstr ""
+
+#: common/kbmailer.cpp:208
+msgid "Error while trying to copy file %1 into archive."
+msgstr ""
+
+#: filters/gettext/gettextexport.cpp:74
+msgid "saving file"
+msgstr ""
+
+#: filters/gettext/gettextimport.cpp:83
+msgid "loading file"
+msgstr "llwytho ffeil..."
+
+#: catalogmanager/validateprogress.cpp:56
 msgid ""
-"<qt>"
-"<p><b>Comparison Options</b></p>"
-"<p>Choose here which messages you want to have treated as a matching "
-"message.</p></qt>"
+"_: Caption of dialog\n"
+"Validation"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:104
-#: kbabeldict/modules/tmx/preferenceswidget.cpp:102
+#: catalogmanager/catalogmanager.cpp:222
+#: catalogmanager/validateprogress.cpp:72
+msgid "&Open"
+msgstr "A&gor"
+
+#: catalogmanager/validateprogress.cpp:73
+msgid "&Ignore"
+msgstr "&Anwybyddu"
+
+#: catalogmanager/catalogmanagerview.cpp:2999
+#: catalogmanager/validateprogress.cpp:98
 msgid ""
-"<qt>"
-"<p><b>3-Gram-matching</b></p>"
-"<p>A message matches another if most of its 3-letter groups are contained in "
-"the other message. e.g. 'abc123' matches 'abcx123c12'.</p></qt>"
+"Cannot instantiate a validation tool.\n"
+"Please check your installation."
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:109
-#: kbabeldict/modules/tmx/preferenceswidget.cpp:107
+#: catalogmanager/catalogmanagerview.cpp:3000
+#: catalogmanager/validateprogress.cpp:99
+msgid "Validation Tool Error"
+msgstr ""
+
+#: catalogmanager/validateprogress.cpp:186
 msgid ""
-"<qt>"
-"<p><b>Location</b></p>"
-"<p>Configure here which file is to be used for searching.</p></qt>"
+"Validation done.\n"
+"\n"
+"Checked files: %1\n"
+"Number of errors: %2\n"
+"Number of ignored errors: %3"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/compendiumdata.cpp:79
-#: kbabeldict/modules/pocompendium/pocompendium.cpp:1195
-#: kbabeldict/modules/tmx/tmxcompendium.cpp:957
-msgid "Loading PO compendium"
+#: catalogmanager/validateprogress.cpp:190
+msgid "Validation Done"
 msgstr ""
 
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:80
-msgid "Loading TMX compendium"
+#: catalogmanager/multiroughtransdlg.cpp:56
+msgid "Files:"
+msgstr "Ffeiliau:"
+
+#: catalogmanager/catalogmanagerview.cpp:94 catalogmanager/future.cpp:5
+#, fuzzy
+msgid "CVS/SVN Status"
+msgstr "Cyflwr"
+
+#: catalogmanager/future.cpp:8
+msgid "Resolved"
 msgstr ""
 
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:92
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:102
-msgid "Cannot open the file."
+#: catalogmanager/future.cpp:9
+msgid "Resolved for Marked"
 msgstr ""
 
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:96
-msgid "Cannot parse XML data."
+#: catalogmanager/future.cpp:10
+msgid "Revert"
+msgstr "Dychwelyd"
+
+#: catalogmanager/future.cpp:11
+msgid "Revert for Marked"
 msgstr ""
 
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:111
-msgid "Unsupported format."
+#: catalogmanager/future.cpp:12
+#, fuzzy
+msgid "Cleanup"
+msgstr "&Gwaredu"
+
+#: catalogmanager/future.cpp:13
+msgid "Cleanup for Marked"
 msgstr ""
 
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:117
+#: catalogmanager/future.cpp:16
+msgid "No repository"
+msgstr ""
+
+#: catalogmanager/catmanlistitem.cpp:80
+msgid "Message Catalogs"
+msgstr "Catalogau Negesau"
+
+#: catalogmanager/catmanlistitem.cpp:450 catalogmanager/catmanlistitem.cpp:637
+msgid "No version control"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:88
+msgid "No CVS repository"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:91
+msgid "Not in CVS"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:94
+#: catalogmanager/libsvn/svnhandler.cpp:96
+msgid "Locally added"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:97
+#: catalogmanager/libsvn/svnhandler.cpp:99
+msgid "Locally removed"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:100
+#: catalogmanager/libsvn/svnhandler.cpp:102
+msgid "Locally modified"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:103
+#: catalogmanager/libsvn/svnhandler.cpp:105
+msgid "Up-to-date"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:106
+#: catalogmanager/libsvn/svnhandler.cpp:108
+msgid "Conflict"
+msgstr ""
+
+#: catalogmanager/libcvs/cvshandler.cpp:109
+#: catalogmanager/libsvn/svnhandler.cpp:113
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: catalogmanager/libcvs/cvshandler.cpp:189
+#: catalogmanager/libcvs/cvshandler.cpp:228
 msgid ""
-"Error while trying to read file for TMX Compendium module:\n"
-"%1\n"
-"Reason: %2"
+"This is not a valid CVS repository. The CVS commands cannot be executed."
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/compendiumdata.cpp:104
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:132
-msgid "Building indices"
+#: catalogmanager/libcvs/cvsdialog.cpp:311
+#: catalogmanager/libcvs/cvshandler.cpp:375
+#: catalogmanager/libsvn/svndialog.cpp:290
+#: catalogmanager/libsvn/svnhandler.cpp:483
+msgid "[ Starting command ]"
 msgstr ""
 
-#: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:229
-msgid "Empty database."
+#: catalogmanager/libcvs/cvsdialog.cpp:68
+msgid "CVS Dialog"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/pc_factory.cpp:95
-#: kbabeldict/modules/pocompendium/pocompendium.cpp:184
-msgid "PO Compendium"
+#: catalogmanager/libcvs/cvsdialog.cpp:77
+#: catalogmanager/libsvn/svndialog.cpp:74
+msgid "Update the following files:"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/pc_factory.cpp:97
-msgid "A module for searching in a PO file"
+#: catalogmanager/libcvs/cvsdialog.cpp:80
+#: catalogmanager/libsvn/svndialog.cpp:77
+msgid "Commit the following files:"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/preferenceswidget.cpp:88
+#: catalogmanager/libcvs/cvsdialog.cpp:83
+msgid "Get status for the following files:"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:86
+#: catalogmanager/libsvn/svndialog.cpp:86
+msgid "Get diff for the following files:"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:100
+#: catalogmanager/libsvn/svndialog.cpp:103
+msgid "&Old messages:"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:108
+#: catalogmanager/libsvn/svndialog.cpp:111
+msgid "&Log message:"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:114
+msgid "E&ncoding:"
+msgstr "A&mgodiad:"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:121
 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>"
+"_: Descriptive encoding name\n"
+"Recommended ( %1 )"
 msgstr ""
 
-#: kbabeldict/modules/pocompendium/compendiumdata.cpp:93
+#: catalogmanager/libcvs/cvsdialog.cpp:122
+msgid ""
+"_: Descriptive encoding name\n"
+"Locale ( %1 )"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:133
+#: catalogmanager/libsvn/svndialog.cpp:124
+msgid "Auto&matically add files if necessary"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:144
+#: catalogmanager/libsvn/svndialog.cpp:135
+msgid "&Commit"
+msgstr "&Cyflwyno"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:147
+#: catalogmanager/libsvn/svndialog.cpp:139
+msgid "&Get Status"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:150
+#: catalogmanager/libsvn/svndialog.cpp:142
+msgid "&Get Diff"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:165
+#: catalogmanager/libsvn/svndialog.cpp:160
+msgid "Command output:"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:237
+#: catalogmanager/libsvn/svndialog.cpp:233
+#, fuzzy
+msgid "The commit log message is empty. Do you want to continue?"
+msgstr "Mae'r ffeil %1 mewn bod yn barod.  Ydych am ysgrifennu drosto?"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:247
 #, c-format
+msgid "Cannot find encoding: %1"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:253
 msgid ""
-"Error while trying to read file for PO Compendium module:\n"
-"%1"
+"The commit log message cannot be encoded in the selected encoding: %1.\n"
+"Do you want to continue?"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1412
-#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:67
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:68
-msgid "Translation Database"
+#: catalogmanager/libcvs/cvsdialog.cpp:268
+#: catalogmanager/libsvn/svndialog.cpp:247
+msgid "Cannot open temporary file for writing. Aborting."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:69
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:70
-msgid "A fast translation search engine based on databases"
+#: catalogmanager/libcvs/cvsdialog.cpp:280
+#: catalogmanager/libsvn/svndialog.cpp:259
+msgid "Cannot write to temporary file. Aborting."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:72
-msgid "Copyright 2000-2003 by Andrea Rizzi"
+#: catalogmanager/libcvs/cvsdialog.cpp:322
+#: catalogmanager/libsvn/svndialog.cpp:301
+msgid "The process could not be started."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:182
-msgid "CHUNK BY CHUNK"
+#: catalogmanager/libcvs/cvsdialog.cpp:351
+#: catalogmanager/libsvn/svndialog.cpp:330
+msgid "[ Exited with status %1 ]"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:183
+#: catalogmanager/libcvs/cvsdialog.cpp:353
+#: catalogmanager/libsvn/svndialog.cpp:332
+msgid "[ Finished ]"
+msgstr ""
+
+#: catalogmanager/libcvs/cvsdialog.cpp:401
+#, fuzzy
 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>"
+"_: Descriptive encoding name\n"
+"Last choice ( %1 )"
+msgstr "Arall (%1)"
+
+#: catalogmanager/catalogmanagerview.cpp:89
+msgid "Name"
+msgstr "Enw"
+
+#: catalogmanager/catalogmanagerview.cpp:90
+msgid "M"
+msgstr "M"
+
+#: catalogmanager/catalogmanagerview.cpp:91
+msgid "Fuzzy"
+msgstr "Niwlaidd"
+
+#: catalogmanager/catalogmanagerview.cpp:92
+msgid "Untranslated"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:374
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:386
-msgid "DYNAMIC DICT:"
+#: catalogmanager/catalogmanagerview.cpp:93
+msgid "Total"
+msgstr "Cyfanswm"
+
+#: catalogmanager/catalogmanagerview.cpp:95
+msgid "Last Revision"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:375
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:387
+#: catalogmanager/catalogmanagerview.cpp:178
+#: catalogmanager/catalogmanagerview.cpp:2447
+#: catalogmanager/catalogmanagerview.cpp:2458
+msgid "Log Window"
+msgstr "Ffenestr Gofnodion"
+
+#: catalogmanager/catalogmanagerview.cpp:180
+msgid "C&lear"
+msgstr "&Gwaredu"
+
+#: catalogmanager/catalogmanagerview.cpp:183
 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>"
+"<qt>"
+"<p><b>Log window</b></p>\n"
+"<p>In this window the output of the executed commands are shown.</p></qt>"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+#: catalogmanager/catalogmanagerview.cpp:194
+msgid ""
+"<qt>"
+"<p><b>Catalog Manager</b></p>\n"
+"<p>The Catalog Manager merges two folders into one tree and displays all\n"
+"PO and POT files in these folders. This way you can easily see if a\n"
+"template has been added or removed. Also some information about the files\n"
+"is displayed.</p>"
+"<p>For more information see section <b>The Catalog Manager</b> "
+"in the online help.</p></qt>"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:473
+msgid ""
+"Error while trying to read file:\n"
+" %1\n"
+"Maybe it is not a valid file with list of markings."
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:571
+msgid ""
+"An error occurred while trying to write to file:\n"
+"%1\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:580
+msgid ""
+"An error occurred while trying to upload the file:\n"
+"%1\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:664
+#: catalogmanager/catalogmanagerview.cpp:691
+msgid ""
+"The Catalog Manager is still updating information about the files.\n"
+"If you continue, it will try to update all necessary files, however this can "
+"take a long time and may lead to wrong results. Please wait until all files are "
+"updated."
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:769
 #, fuzzy
-msgid "Create Database"
-msgstr "Cronfa ddata"
+msgid ""
+"Statistics for all:\n"
+msgstr "Ystadegau"
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
-msgid "Create"
-msgstr "Creu"
+#: catalogmanager/catalogmanagerview.cpp:771
+msgid ""
+"Statistics for %1:\n"
+msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
-msgid "Do Not Create"
+#: catalogmanager/catalogmanagerview.cpp:773
+msgid ""
+"Number of packages: %1\n"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:562
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:614
+#: catalogmanager/catalogmanagerview.cpp:776
 msgid ""
-"The name you chose is already used.\n"
-"Please change the source name."
+"Complete translated: %1 % (%2)\n"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:563
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:615
-msgid "Name is Not Unique"
+#: catalogmanager/catalogmanagerview.cpp:779
+msgid ""
+"Only template available: %1 % (%2)\n"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:102
-#, c-format
-msgid "Scanning file: %1"
+#: catalogmanager/catalogmanagerview.cpp:781
+msgid ""
+"Only PO file available: %1 % (%2)\n"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:107
+#: catalogmanager/catalogmanagerview.cpp:783
+msgid ""
+"Number of messages: %1\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:787
+msgid ""
+"Translated: %1 % (%2)\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:790
+msgid ""
+"Fuzzy: %1 % (%2)\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:793
+msgid ""
+"Untranslated: %1 % (%2)\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:820
+msgid ""
+"The file is syntactically correct.\n"
+"Output of \"msgfmt --statistics\":"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:825
+msgid ""
+"The file has syntax errors.\n"
+"Output of \"msgfmt --statistics\":"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:830
+msgid ""
+"The file has header syntax error.\n"
+"Output of \"msgfmt --statistics\":"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:835
+msgid "An error occurred while processing \"msgfmt --statistics\""
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:840
+#: catalogmanager/catalogmanagerview.cpp:929
+msgid ""
+"Cannot execute msgfmt. Please make sure that you have msgfmt in your PATH."
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:868
+msgid ""
+"All files in folder %1 are syntactically correct.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:873
+msgid ""
+"All files in the base folder are syntactically correct.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:884
+msgid ""
+"At least one file in folder %1 has syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:889
+msgid ""
+"At least one file in the base folder has syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:900
+msgid ""
+"At least one file in folder %1 has header syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:905
+msgid ""
+"At least one file in the base folder has header syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:916
 #, c-format
-msgid "Entries added: %1"
+msgid ""
+"An error occurred while processing \"msgfmt --statistics *.po\" in folder %1"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:71
-msgid "Copyright 2000-2001 by Andrea Rizzi"
+#: catalogmanager/catalogmanagerview.cpp:921
+msgid ""
+"An error occurred while processing \"msgfmt --statistics *.po\" in the base "
+"folder"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:84
-msgid "No error"
-msgstr "Dim gwall"
+#: catalogmanager/catalogmanagerview.cpp:1502
+msgid "Do you really want to delete the file %1?"
+msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:125
+#: catalogmanager/catalogmanagerview.cpp:1507
+msgid "Was not able to delete the file %1!"
+msgstr ""
+
+#: catalogmanager/catalogmanagerview.cpp:1766
 msgid ""
-"Database folder does not exist:\n"
+"You have not specified a valid folder for the base folder of the PO files:\n"
 "%1\n"
-"Do you want to create it now?"
+"Please check your settings in the project settings dialog."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
-msgid "Create Folder"
-msgstr "Creu Plygell"
+#: catalogmanager/catalogmanagerview.cpp:1783
+msgid ""
+"You have not specified a valid folder for the base folder of the PO template "
+"files:\n"
+"%1\n"
+"Please check your settings in the project settings dialog."
+msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:146
-#, c-format
-msgid "It was not possible to create folder %1"
+#: catalogmanager/catalogmanagerview.cpp:1824
+msgid "Reading file information"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:176
+#: catalogmanager/catalogmanagerview.cpp:3008
+msgid "Validation Options"
+msgstr "Dewisiadau Gwiriant"
+
+#: catalogmanager/markpatterndialog.cpp:113
+msgid "Ma&rk files which match the following pattern:"
+msgstr ""
+
+#: catalogmanager/markpatterndialog.cpp:114
+msgid "&Mark Files"
+msgstr ""
+
+#: catalogmanager/markpatterndialog.cpp:116
+msgid "Unma&rk files which match the following pattern:"
+msgstr ""
+
+#: catalogmanager/markpatterndialog.cpp:117
+msgid "Un&mark Files"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:50
+msgid "File Options"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:53
+msgid "&In all files"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:54
+msgid "&Marked files"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:55
+msgid "In &templates"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:56
+msgid "Ask before ne&xt file"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:57
+msgid "Save &without asking"
+msgstr ""
+
+#: catalogmanager/findinfilesdialog.cpp:59
 msgid ""
-"<p>There are backup database files from previous versions of KBabel. However, "
-"another version of KBabel (probably from TDE 3.1.1 or 3.1.2) created a new "
-"database. As a result, your KBabel installation contains two versions of "
-"database files. Unfortunatelly, the old and new version can not be merged. You "
-"need to choose one of them."
-"<br/>"
-"<br/>If you choose the old version, the new one will be removed. If you choose "
-"the new version, the old database files will be left alone and you need to "
-"remove them manually. Otherwise this message will be displayed again (the old "
-"files are at $TDEHOME/share/apps/kbabeldict/dbsearchengine/*,old).</p>"
+"<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 ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:185
-msgid "Old Database Found"
+#: catalogmanager/libsvn/svnhandler.cpp:90
+msgid "No SVN repository"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:186
-msgid "Use &Old Database"
+#: catalogmanager/libsvn/svnhandler.cpp:93
+msgid "Not in SVN"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:187
-msgid "Use &New Database"
+#: catalogmanager/libsvn/svnhandler.cpp:111
+msgid "Error in Working Copy"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
+#: catalogmanager/libsvn/svnhandler.cpp:288
 msgid ""
-"Database files not found.\n"
-"Do you want to create them now?"
+"This is not a valid SVN repository. The SVN commands cannot be executed."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:408
-msgid "Cannot open the database"
+#: catalogmanager/libsvn/svndialog.cpp:65
+msgid "SVN Dialog"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:431
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:640
-msgid "Another search has already been started"
+#: catalogmanager/libsvn/svndialog.cpp:80
+msgid "Get remote status for the following files:"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:438
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:647
-msgid "Unable to search now: a PO file scan is in progress"
+#: catalogmanager/libsvn/svndialog.cpp:83
+msgid "Get local status for the following files:"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:445
-msgid "Unable to open the database"
+#: catalogmanager/libsvn/svndialog.cpp:89
+msgid "Get information for the following files:"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:451
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:658
-msgid "Database empty"
+#: catalogmanager/libsvn/svndialog.cpp:145
+#, fuzzy
+msgid "&Get Information"
+msgstr "Gwybodaeth Catalog"
+
+#: catalogmanager/catalogmanager.cpp:225
+msgid "&Open Template"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:462
-msgid "No entry for this package in the database."
+#: catalogmanager/catalogmanager.cpp:228
+msgid "Open in &New Window"
+msgstr "Agor mew&n Ffenestr Newydd"
+
+#: catalogmanager/catalogmanager.cpp:237
+msgid "Fi&nd in Files..."
+msgstr "Ca&nfod mewn Ffeiliau ..."
+
+#: catalogmanager/catalogmanager.cpp:240
+msgid "Re&place in Files..."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:469
-msgid "Searching for %1 in database"
+#: catalogmanager/catalogmanager.cpp:251
+msgid "&Toggle Marking"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:548
-msgid "Looking for repetitions"
+#: catalogmanager/catalogmanager.cpp:254
+msgid "Remove Marking"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:562
-msgid "Minimum Repetition"
+#: catalogmanager/catalogmanager.cpp:257
+msgid "Toggle All Markings"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:564
-msgid "Insert the minimum number of repetitions for a string:"
+#: catalogmanager/catalogmanager.cpp:260
+msgid "Remove All Markings"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:572
-msgid "Searching repeated string"
+#: catalogmanager/catalogmanager.cpp:263
+msgid "Mark Modified Files"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1240
-msgid "Select Folder to Scan Recursively"
+#: catalogmanager/catalogmanager.cpp:267
+msgid "&Load Markings..."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1263
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1315
-#, c-format
-msgid "Scanning folder %1"
-msgstr "Yn sganio plygell %1"
+#: catalogmanager/catalogmanager.cpp:270
+msgid "&Save Markings..."
+msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1299
-msgid "Select Folder to Scan"
+#: catalogmanager/catalogmanager.cpp:273
+msgid "&Mark Files..."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1358
-msgid "Select PO File to Scan"
+#: catalogmanager/catalogmanager.cpp:275
+msgid "&Unmark Files..."
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1372
-#, c-format
-msgid "Scanning file %1"
+#: catalogmanager/catalogmanager.cpp:309
+msgid "Next Te&mplate Only"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1608
-msgid "Searching words"
+#: catalogmanager/catalogmanager.cpp:312
+msgid "Previous Temp&late Only"
 msgstr ""
 
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1850
-msgid "Process output"
+#: catalogmanager/catalogmanager.cpp:315
+msgid "Next Tran&slation Exists"
 msgstr ""
 
-#: kbabeldict/modules/poauxiliary/pa_factory.cpp:95
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:147
-msgid "PO Auxiliary"
+#: catalogmanager/catalogmanager.cpp:318
+msgid "Previous Transl&ation Exists"
 msgstr ""
 
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:426
-msgid "Loading PO auxiliary"
+#: catalogmanager/catalogmanager.cpp:322
+msgid "Previous Marke&d"
 msgstr ""
 
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:438
-#, c-format
-msgid ""
-"Error while trying to open file for PO Auxiliary module:\n"
-"%1"
+#: catalogmanager/catalogmanager.cpp:325
+msgid "Next &Marked"
 msgstr ""
 
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:450
-msgid "Building index"
+#: catalogmanager/catalogmanager.cpp:350
+msgid "&Statistics"
+msgstr "&Ystadegaeth"
+
+#: catalogmanager/catalogmanager.cpp:353
+msgid "S&tatistics in Marked"
 msgstr ""
 
-#: kbabeldict/modules/poauxiliary/pa_factory.cpp:97
-msgid "A simple module for exact searching in a PO file"
+#: catalogmanager/catalogmanager.cpp:356
+msgid "Check S&yntax"
 msgstr ""
 
-#: kbabeldict/kbabeldictview.cpp:83
-msgid "Search in module:"
+#: catalogmanager/catalogmanager.cpp:359
+msgid "S&pell Check"
+msgstr "G&wirio Sillafu"
+
+#: catalogmanager/catalogmanager.cpp:362
+msgid "Spell Check in &Marked"
 msgstr ""
 
-#: kbabeldict/kbabeldictview.cpp:106
-msgid "&Start Search"
+#: catalogmanager/catalogmanager.cpp:365
+msgid "&Rough Translation"
 msgstr ""
 
-#: kbabeldict/kbabeldictview.cpp:108
-msgid "Sea&rch in translations"
+#: catalogmanager/catalogmanager.cpp:368
+msgid "Rough Translation in M&arked"
 msgstr ""
 
-#: kbabeldict/kbabeldictview.cpp:125
-msgid "Settings:"
-msgstr "Gosodiadau :"
+#: catalogmanager/catalogmanager.cpp:371
+msgid "Mai&l"
+msgstr "Pos&t"
 
-#: kbabeldict/aboutmoduledlg.cpp:42
-msgid "Report Bug..."
-msgstr "Anfon adroddiad nam..."
+#: catalogmanager/catalogmanager.cpp:374
+msgid "Mail Mar&ked"
+msgstr ""
 
-#: kbabeldict/kbabeldict.cpp:45
-msgid "KBabelDict"
+#: catalogmanager/catalogmanager.cpp:378
+msgid "&Pack"
 msgstr ""
 
-#: kbabeldict/kbabeldict.cpp:47
-msgid "About Module"
+#: catalogmanager/catalogmanager.cpp:380
+msgid "Pack &Marked"
 msgstr ""
 
-#: kbabeldict/kbabeldict.cpp:48 kbabeldict/kbabeldict.cpp:104
-msgid "Hide Sett&ings"
+#: catalogmanager/catalogmanager.cpp:412
+msgid "V&alidation Marked"
 msgstr ""
 
-#: kbabeldict/kbabeldict.cpp:108
-msgid "Show Sett&ings"
+#: catalogmanager/catalogmanager.cpp:425 catalogmanager/catalogmanager.cpp:451
+msgid "Update"
+msgstr "Diweddaru"
+
+#: catalogmanager/catalogmanager.cpp:427 catalogmanager/catalogmanager.cpp:453
+msgid "Update Marked"
 msgstr ""
 
-#: kbabeldict/dictchooser.cpp:59
+#: catalogmanager/catalogmanager.cpp:429 catalogmanager/catalogmanager.cpp:455
+msgid "Commit"
+msgstr "Cyflwyno"
+
+#: catalogmanager/catalogmanager.cpp:431 catalogmanager/catalogmanager.cpp:457
+msgid "Commit Marked"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:433
+msgid "Status"
+msgstr "Cyflwr"
+
+#: catalogmanager/catalogmanager.cpp:435
+msgid "Status for Marked"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:437 catalogmanager/catalogmanager.cpp:467
+msgid "Show Diff"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:459
+#, fuzzy
+msgid "Status (Local)"
+msgstr "Cyflwr:"
+
+#: catalogmanager/catalogmanager.cpp:461
+msgid "Status (Local) for Marked"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:463
+#, fuzzy
+msgid "Status (Remote)"
+msgstr "Cyflwr:"
+
+#: catalogmanager/catalogmanager.cpp:465
+msgid "Status (Remote) for Marked"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:469
+#, fuzzy
+msgid "Show Information"
+msgstr "Gwybodaeth Catalog"
+
+#: catalogmanager/catalogmanager.cpp:471
+msgid "Show Information for Marked"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:488 catalogmanager/catalogmanager.cpp:503
+msgid "Update Templates"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:490 catalogmanager/catalogmanager.cpp:505
+msgid "Update Marked Templates"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:492 catalogmanager/catalogmanager.cpp:507
+msgid "Commit Templates"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:494 catalogmanager/catalogmanager.cpp:509
+msgid "Commit Marked Templates"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:525 catalogmanager/catalogmanager.cpp:529
+msgid "Commands"
+msgstr "Gorchmynion:"
+
+#: catalogmanager/catalogmanager.cpp:558
 msgid ""
-"_: dictionary to not use\n"
-"Do not use:"
+"<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 ""
 
-#: kbabeldict/dictchooser.cpp:62
+#: catalogmanager/catalogmanager.cpp:663 catalogmanager/catalogmanager.cpp:696
+#: catalogmanager/catalogmanager.cpp:727 catalogmanager/catalogmanager.cpp:757
+#: catalogmanager/catalogmanager.cpp:787 catalogmanager/catalogmanager.cpp:807
+#: catalogmanager/catalogmanager.cpp:827
 msgid ""
-"_: dictionary to use\n"
-"Use:"
-msgstr "Defnydd :"
+"Cannot send a message to KBabel.\n"
+"Please check your TDE installation."
+msgstr ""
 
-#: kbabeldict/dictchooser.cpp:84
-msgid "Move &Up"
-msgstr "Symud i &Fyny"
+#: 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 ""
 
-#: kbabeldict/dictchooser.cpp:87
-msgid "Move &Down"
-msgstr "Symud i &Lawr"
+#: catalogmanager/catalogmanager.cpp:893
+msgid "Found: 0/0"
+msgstr ""
 
-#: kbabeldict/dictchooser.cpp:90
-msgid "Con&figure..."
-msgstr "Ffurf&weddu..."
+#: catalogmanager/catalogmanager.cpp:915
+msgid "Found: %1/%2"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:986
+#: catalogmanager/catalogmanager.cpp:1073
+msgid "DCOP communication with KBabel failed."
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:986
+#: catalogmanager/catalogmanager.cpp:1073
+msgid "DCOP Communication Error"
+msgstr "Gwall Cyfathrebu DCOP"
+
+#: catalogmanager/catalogmanager.cpp:1001
+#: catalogmanager/catalogmanager.cpp:1087
+msgid "KBabel cannot be started."
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:1001
+#: catalogmanager/catalogmanager.cpp:1087
+msgid "Cannot Start KBabel"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:1008
+#: catalogmanager/catalogmanager.cpp:1094
+msgid "Search string not found!"
+msgstr ""
+
+#: catalogmanager/catalogmanager.cpp:1235
+#, c-format
+msgid "Cannot open project file %1"
+msgstr ""
+
+#: catalogmanager/main.cpp:186
+msgid "KBabel - Catalog Manager"
+msgstr "KBabel - Rheolwr Catalog"
+
+#: catalogmanager/main.cpp:187
+msgid "An advanced catalog manager for KBabel"
+msgstr ""
+
+#: catalogmanager/main.cpp:211
+msgid "Support for making diffs and some minor improvements."
+msgstr ""
+
+#: catalogmanager/main.cpp:216
+msgid "KBabel contains code from GNU gettext"
+msgstr ""
 
 #, fuzzy
 #~ msgid ""
diff --git a/tde-i18n-cy/messages/tdesdk/kbugbuster.po b/tde-i18n-cy/messages/tdesdk/kbugbuster.po
index 3d8fa21f517..e055ca21ca3 100644
--- a/tde-i18n-cy/messages/tdesdk/kbugbuster.po
+++ b/tde-i18n-cy/messages/tdesdk/kbugbuster.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/kbugbuster.po\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -311,16 +312,16 @@ msgstr ""
 msgid "My Bugs"
 msgstr ""
 
-#: backend/bugserver.cpp:289
+#: backend/bugserver.cpp:290
 msgid "Mail generated by KBugBuster"
 msgstr ""
 
-#: backend/bugserver.cpp:321
+#: backend/bugserver.cpp:322
 #, c-format
 msgid "Control command: %1"
 msgstr ""
 
-#: backend/bugserver.cpp:323
+#: backend/bugserver.cpp:324
 #, c-format
 msgid "Mail to %1"
 msgstr "Ebost i %1"
@@ -330,7 +331,7 @@ msgid "Retrieving My Bugs list..."
 msgstr ""
 
 #: backend/kbbprefs.cpp:137
-msgid "Bug Fixed in CVS"
+msgid "Bug Fixed in GIT"
 msgstr ""
 
 #: backend/kbbprefs.cpp:140
@@ -342,7 +343,7 @@ msgid "Packaging Bug"
 msgstr ""
 
 #: backend/kbbprefs.cpp:149
-msgid "Feature Implemented in CVS"
+msgid "Feature Implemented in GIT"
 msgstr ""
 
 #: backend/kbbprefs.cpp:152
@@ -788,15 +789,15 @@ msgid "&Recipient:"
 msgstr "&Derbyniwr:"
 
 #: gui/msginputdialog.cpp:63
-msgid "Normal (bugs.kde.org & Maintainer & kde-bugs-dist)"
+msgid "Normal (bugs.trinitydesktop.org & Maintainer & tde-bugs-dist)"
 msgstr ""
 
 #: gui/msginputdialog.cpp:64
-msgid "Maintonly (bugs.kde.org & Maintainer)"
+msgid "Maintonly (bugs.trinitydesktop.org & Maintainer)"
 msgstr ""
 
 #: gui/msginputdialog.cpp:65
-msgid "Quiet (bugs.kde.org only)"
+msgid "Quiet (bugs.trinitydesktop.org only)"
 msgstr ""
 
 #: gui/msginputdialog.cpp:77
diff --git a/tde-i18n-cy/messages/tdesdk/kompare.po b/tde-i18n-cy/messages/tdesdk/kompare.po
index fbe656dbe49..e20b5d58626 100644
--- a/tde-i18n-cy/messages/tdesdk/kompare.po
+++ b/tde-i18n-cy/messages/tdesdk/kompare.po
@@ -1,14 +1,460 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/kompare.po\n"
-"POT-Creation-Date: 2007-12-20 01:16+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: komparenavtreepart/komparenavtreepart.cpp:61
+msgid "Source Folder"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:66
+msgid "Destination Folder"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:71
+msgid "Source File"
+msgstr "Ffeil Tarddiad"
+
+#: komparenavtreepart/komparenavtreepart.cpp:72
+msgid "Destination File"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:78
+msgid "Source Line"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:79
+msgid "Destination Line"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:80
+msgid "Difference"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:426
+#, c-format
+msgid ""
+"_n: Applied: Changes made to %n line undone\n"
+"Applied: Changes made to  %n lines undone"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:429
+#, c-format
+msgid ""
+"_n: Changed %n line\n"
+"Changed %n lines"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:434
+#, c-format
+msgid ""
+"_n: Applied: Insertion of %n line undone\n"
+"Applied: Insertion of %n lines undone"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:437
+#, c-format
+msgid ""
+"_n: Inserted %n line\n"
+"Inserted %n lines"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:442
+#, c-format
+msgid ""
+"_n: Applied: Deletion of %n line undone\n"
+"Applied: Deletion of %n lines undone"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:445
+#, c-format
+msgid ""
+"_n: Deleted %n line\n"
+"Deleted %n lines"
+msgstr ""
+
+#: komparenavtreepart/komparenavtreepart.cpp:531
+#: komparepart/kompare_part.cpp:651
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: komparenavtreepart/komparenavtreepart.cpp:694
+msgid "KompareNavTreePart"
+msgstr "KompareNavTreePart"
+
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
+msgid ""
+"<qt>No models or no differences, this file: <b>%1</b>"
+", is not a valid diff file.</qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
+".</qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:368
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:383
+msgid ""
+"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
+". The temporary file is still available under: <b>%2</b>"
+". You can manually copy it to the right place.</qt>"
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr ""
+
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr ""
+
+#: kompare_shell.cpp:77
+msgid "Could not find our KompareViewPart."
+msgstr ""
+
+#: kompare_shell.cpp:106
+msgid "Could not load our KompareViewPart."
+msgstr ""
+
+#: kompare_shell.cpp:114
+msgid "Could not find our KompareNavigationPart."
+msgstr ""
+
+#: kompare_shell.cpp:138
+msgid "Could not load our KompareNavigationPart."
+msgstr ""
+
+#: kompare_shell.cpp:233
+msgid "&Open Diff..."
+msgstr ""
+
+#: kompare_shell.cpp:234
+msgid "&Compare Files..."
+msgstr ""
+
+#: kompare_shell.cpp:237
+msgid "&Blend URL with Diff..."
+msgstr ""
+
+#: kompare_shell.cpp:246
+msgid "Show T&ext View"
+msgstr ""
+
+#: kompare_shell.cpp:248
+msgid "Hide T&ext View"
+msgstr ""
+
+#: kompare_shell.cpp:257
+msgid " 0 of 0 differences "
+msgstr ""
+
+#: kompare_shell.cpp:258
+msgid " 0 of 0 files "
+msgstr ""
+
+#: kompare_shell.cpp:273
+msgid ""
+"_n:  %1 of %n file \n"
+" %1 of %n files "
+msgstr ""
+
+#: kompare_shell.cpp:275
+#, c-format
+msgid ""
+"_n:  %n file \n"
+" %n files "
+msgstr ""
+
+#: kompare_shell.cpp:278
+msgid ""
+"_n:  %1 of %n difference, %2 applied \n"
+" %1 of %n differences, %2 applied "
+msgstr ""
+
+#: kompare_shell.cpp:281
+#, c-format
+msgid ""
+"_n:  %n difference \n"
+" %n differences "
+msgstr ""
+
+#: kompare_shell.cpp:369
+msgid "Blend File/Folder with diff Output"
+msgstr ""
+
+#: kompare_shell.cpp:370
+msgid "File/Folder"
+msgstr ""
+
+#: kompare_shell.cpp:371
+msgid "Diff Output"
+msgstr ""
+
+#: kompare_shell.cpp:373
+msgid "Blend"
+msgstr ""
+
+#: kompare_shell.cpp:373
+msgid "Blend this file or folder with the diff output"
+msgstr ""
+
+#: 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 ""
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr ""
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "Tarddiad"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "Cyrchfan"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr ""
+
+#: kompare_shell.cpp:402
+msgid "Compare these files or folders"
+msgstr ""
+
+#: 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 ""
+
+#: kompare_shell.cpp:439
+msgid "Text View"
+msgstr "Golwg Testun"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr ""
+
+#: 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 ""
+
+#: kompareurldialog.cpp:53
+msgid "Here you can change the options for the view."
+msgstr ""
+
+#. i18n: file komparepart/komparepartui.rc line 13
+#: rc.cpp:15
+#, no-c-format
+msgid "&Difference"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
+#: rc.cpp:21
+#, no-c-format
+msgid "Run Diff In"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
+#: rc.cpp:24
+#, no-c-format
+msgid "Command Line"
+msgstr "Llinell orchymyn"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
+#: rc.cpp:27
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
+#: rc.cpp:33
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
+#: rc.cpp:36
+#, no-c-format
+msgid "Optimize for large files"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
+#: rc.cpp:39
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
+#: rc.cpp:42
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
+#: rc.cpp:45
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
+#: rc.cpp:48
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
+#: rc.cpp:51
+#, no-c-format
+msgid "Show function names"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
+#: rc.cpp:54
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
+#: rc.cpp:57
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
+#: rc.cpp:60
+#, no-c-format
+msgid "Format"
+msgstr "Fformat"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 244
+#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63
+#, no-c-format
+msgid "Context"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 252
+#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66
+#, no-c-format
+msgid "Ed"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 260
+#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69
+#, no-c-format
+msgid "Normal"
+msgstr "Arferol"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 268
+#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72
+#, no-c-format
+msgid "RCS"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 276
+#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75
+#, no-c-format
+msgid "Unified"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
+#: rc.cpp:78
+#, no-c-format
+msgid "Side-by-side"
+msgstr ""
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
+#: libdialogpages/diffpage.cpp:251 rc.cpp:81
+#, no-c-format
+msgid "Number of context lines:"
+msgstr ""
+
 #: komparepart/kompareprefdlg.cpp:33
 msgid "Preferences"
 msgstr "Hoffterau"
@@ -17,10 +463,6 @@ msgstr "Hoffterau"
 msgid "View Settings"
 msgstr "Gweld Gosodiadau"
 
-#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
-msgid "Diff"
-msgstr "Diff"
-
 #: komparepart/kompareprefdlg.cpp:43
 msgid "Diff Settings"
 msgstr ""
@@ -120,41 +562,6 @@ msgstr ""
 msgid "Save Changes?"
 msgstr "Cadw Newidiadau?"
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 276
-#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75
-#, no-c-format
-msgid "Unified"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 244
-#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63
-#, no-c-format
-msgid "Context"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 268
-#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72
-#, no-c-format
-msgid "RCS"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 252
-#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66
-#, no-c-format
-msgid "Ed"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 260
-#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69
-#, no-c-format
-msgid "Normal"
-msgstr "Arferol"
-
-#: komparenavtreepart/komparenavtreepart.cpp:531
-#: komparepart/kompare_part.cpp:651
-msgid "Unknown"
-msgstr "Anhysbys"
-
 #: komparepart/kompare_part.cpp:667
 msgid ""
 "No diff file, or no 2 files have been diffed. Therefore no stats are available."
@@ -191,6 +598,14 @@ msgid ""
 "Number of differences: %6"
 msgstr ""
 
+#: libdialogpages/filespage.cpp:53
+msgid "Encoding"
+msgstr "Amgodiad"
+
+#: libdialogpages/filespage.cpp:64
+msgid "&Files"
+msgstr "&Ffeiliau"
+
 #: libdialogpages/viewpage.cpp:51
 msgid "Colors"
 msgstr "Lliwiau"
@@ -273,12 +688,6 @@ msgstr ""
 msgid "Lines of Context"
 msgstr ""
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr ""
-
 #: libdialogpages/diffpage.cpp:253
 msgid ""
 "The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -431,26 +840,6 @@ msgstr ""
 msgid "&Exclude"
 msgstr ""
 
-#: libdialogpages/filespage.cpp:53
-msgid "Encoding"
-msgstr "Amgodiad"
-
-#: libdialogpages/filespage.cpp:64
-msgid "&Files"
-msgstr "&Ffeiliau"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
 #: main.cpp:33
 msgid ""
 "A program to view the differences between files and optionally generate a diff"
@@ -511,394 +900,6 @@ msgstr ""
 msgid "Cervisia diff viewer"
 msgstr ""
 
-#: kompare_shell.cpp:397 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr ""
-
-#: kompare_shell.cpp:398 main.cpp:186
-msgid "Source"
-msgstr "Tarddiad"
-
-#: kompare_shell.cpp:399 main.cpp:187
-msgid "Destination"
-msgstr "Cyrchfan"
-
-#: kompare_shell.cpp:401 main.cpp:189
-msgid "Compare"
-msgstr ""
-
 #: main.cpp:189
 msgid "Compare these files or folder"
 msgstr ""
-
-#: kompare_shell.cpp:401 main.cpp:189
-msgid ""
-"If you have entered 2 filenames or 2 folders in the fields in this dialog then "
-"this button will be enabled and pressing it will start a comparison of the "
-"entered files or folders. "
-msgstr ""
-
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr ""
-
-#: kompareurldialog.cpp:47
-msgid "Here you can change the options for comparing the files."
-msgstr ""
-
-#: kompareurldialog.cpp:53
-msgid "Here you can change the options for the view."
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:61
-msgid "Source Folder"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:66
-msgid "Destination Folder"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:71
-msgid "Source File"
-msgstr "Ffeil Tarddiad"
-
-#: komparenavtreepart/komparenavtreepart.cpp:72
-msgid "Destination File"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:78
-msgid "Source Line"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:79
-msgid "Destination Line"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:80
-msgid "Difference"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:426
-#, c-format
-msgid ""
-"_n: Applied: Changes made to %n line undone\n"
-"Applied: Changes made to  %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:429
-#, c-format
-msgid ""
-"_n: Changed %n line\n"
-"Changed %n lines"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:434
-#, c-format
-msgid ""
-"_n: Applied: Insertion of %n line undone\n"
-"Applied: Insertion of %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:437
-#, c-format
-msgid ""
-"_n: Inserted %n line\n"
-"Inserted %n lines"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:442
-#, c-format
-msgid ""
-"_n: Applied: Deletion of %n line undone\n"
-"Applied: Deletion of %n lines undone"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:445
-#, c-format
-msgid ""
-"_n: Deleted %n line\n"
-"Deleted %n lines"
-msgstr ""
-
-#: komparenavtreepart/komparenavtreepart.cpp:694
-msgid "KompareNavTreePart"
-msgstr "KompareNavTreePart"
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "Llinell orchymyn"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr ""
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "Fformat"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr ""
-
-#: kompare_shell.cpp:77
-msgid "Could not find our KompareViewPart."
-msgstr ""
-
-#: kompare_shell.cpp:106
-msgid "Could not load our KompareViewPart."
-msgstr ""
-
-#: kompare_shell.cpp:114
-msgid "Could not find our KompareNavigationPart."
-msgstr ""
-
-#: kompare_shell.cpp:138
-msgid "Could not load our KompareNavigationPart."
-msgstr ""
-
-#: kompare_shell.cpp:232
-msgid "&Open Diff..."
-msgstr ""
-
-#: kompare_shell.cpp:233
-msgid "&Compare Files..."
-msgstr ""
-
-#: kompare_shell.cpp:236
-msgid "&Blend URL with Diff..."
-msgstr ""
-
-#: kompare_shell.cpp:245
-msgid "Show T&ext View"
-msgstr ""
-
-#: kompare_shell.cpp:247
-msgid "Hide T&ext View"
-msgstr ""
-
-#: kompare_shell.cpp:256
-msgid " 0 of 0 differences "
-msgstr ""
-
-#: kompare_shell.cpp:257
-msgid " 0 of 0 files "
-msgstr ""
-
-#: kompare_shell.cpp:272
-msgid ""
-"_n:  %1 of %n file \n"
-" %1 of %n files "
-msgstr ""
-
-#: kompare_shell.cpp:274
-#, c-format
-msgid ""
-"_n:  %n file \n"
-" %n files "
-msgstr ""
-
-#: kompare_shell.cpp:277
-msgid ""
-"_n:  %1 of %n difference, %2 applied \n"
-" %1 of %n differences, %2 applied "
-msgstr ""
-
-#: kompare_shell.cpp:280
-#, c-format
-msgid ""
-"_n:  %n difference \n"
-" %n differences "
-msgstr ""
-
-#: kompare_shell.cpp:368
-msgid "Blend File/Folder with diff Output"
-msgstr ""
-
-#: kompare_shell.cpp:369
-msgid "File/Folder"
-msgstr ""
-
-#: kompare_shell.cpp:370
-msgid "Diff Output"
-msgstr ""
-
-#: kompare_shell.cpp:372
-msgid "Blend"
-msgstr ""
-
-#: kompare_shell.cpp:372
-msgid "Blend this file or folder with the diff output"
-msgstr ""
-
-#: kompare_shell.cpp:372
-msgid ""
-"If you have entered a file or folder name and a file that contains diff output "
-"in the fields in this dialog then this button will be enabled and pressing it "
-"will open kompare's main view where the output of the entered file or files "
-"from the folder are mixed with the diff output so you can then apply the "
-"difference(s) to a file or to the files. "
-msgstr ""
-
-#: kompare_shell.cpp:401
-msgid "Compare these files or folders"
-msgstr ""
-
-#: kompare_shell.cpp:439
-msgid "Text View"
-msgstr "Golwg Testun"
-
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
-msgid ""
-"<qt>No models or no differences, this file: <b>%1</b>"
-", is not a valid diff file.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:246
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:271
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:368
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:383
-msgid ""
-"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
-". The temporary file is still available under: <b>%2</b>"
-". You can manually copy it to the right place.</qt>"
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr ""
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr ""
diff --git a/tde-i18n-cy/messages/tdesdk/kres_bugzilla.po b/tde-i18n-cy/messages/tdesdk/kres_bugzilla.po
index 0c8c3450a5a..b79fd2ab133 100644
--- a/tde-i18n-cy/messages/tdesdk/kres_bugzilla.po
+++ b/tde-i18n-cy/messages/tdesdk/kres_bugzilla.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/kstartperf.po b/tde-i18n-cy/messages/tdesdk/kstartperf.po
index 4fa061227ea..1f4b04c85d9 100644
--- a/tde-i18n-cy/messages/tdesdk/kstartperf.po
+++ b/tde-i18n-cy/messages/tdesdk/kstartperf.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/kstartperf.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/kuiviewer.po b/tde-i18n-cy/messages/tdesdk/kuiviewer.po
index 4706899976b..de5bc8f77c5 100644
--- a/tde-i18n-cy/messages/tdesdk/kuiviewer.po
+++ b/tde-i18n-cy/messages/tdesdk/kuiviewer.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/kuiviewer.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/spy.po b/tde-i18n-cy/messages/tdesdk/spy.po
index ebe28746262..77b071c5b25 100644
--- a/tde-i18n-cy/messages/tdesdk/spy.po
+++ b/tde-i18n-cy/messages/tdesdk/spy.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/spy.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,14 +22,6 @@ msgstr "Math"
 msgid "Member Name"
 msgstr ""
 
-#: classinfoview.cpp:30 navview.cpp:28 propsview.cpp:53
-msgid "Name"
-msgstr "Enw"
-
-#: classinfoview.cpp:31 propsview.cpp:54
-msgid "Value"
-msgstr "Gwerth"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -41,10 +34,6 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: main.cpp:25 main.cpp:38
-msgid "Spy"
-msgstr "Ysbio"
-
 #: spy.cpp:67
 msgid "Signals && Slots"
 msgstr ""
@@ -57,6 +46,14 @@ msgstr ""
 msgid "Class Info"
 msgstr ""
 
+#: classinfoview.cpp:30 navview.cpp:28 propsview.cpp:53
+msgid "Name"
+msgstr "Enw"
+
+#: classinfoview.cpp:31 propsview.cpp:54
+msgid "Value"
+msgstr "Gwerth"
+
 #: propsview.cpp:56
 msgid "Access"
 msgstr "Cyrchiad"
@@ -69,6 +66,10 @@ msgstr ""
 msgid "Type Flags"
 msgstr ""
 
+#: main.cpp:25 main.cpp:38
+msgid "Spy"
+msgstr "Ysbio"
+
 #: sigslotview.cpp:30
 msgid "Signals/Slots"
 msgstr ""
diff --git a/tde-i18n-cy/messages/tdesdk/tdecachegrind.po b/tde-i18n-cy/messages/tdesdk/tdecachegrind.po
index 440a42e4120..e07d23721a9 100644
--- a/tde-i18n-cy/messages/tdesdk/tdecachegrind.po
+++ b/tde-i18n-cy/messages/tdesdk/tdecachegrind.po
@@ -1,178 +1,306 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/tdecachegrind.po\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: instritem.cpp:106 sourceitem.cpp:86
-msgid "Active call to '%1'"
-msgstr ""
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
 
-#: instritem.cpp:108 sourceitem.cpp:88
+#: _translatorinfo.cpp:3
 msgid ""
-"_n: %n call to '%1'\n"
-"%n calls to '%1'"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: cachegrindloader.cpp:141
+msgid "Import filter for Cachegrind/Callgrind generated profile data files"
 msgstr ""
 
-#: instritem.cpp:137
-msgid "Jump %1 of %2 times to 0x%3"
+#: cachegrindloader.cpp:738
+#, c-format
+msgid "Loading %1"
+msgstr "llwytho %1"
+
+#: tabview.cpp:64
+msgid "Move to Top"
 msgstr ""
 
-#: instritem.cpp:142
-msgid "Jump %1 times to 0x%2"
+#: tabview.cpp:68
+msgid "Move to Right"
 msgstr ""
 
-#: instritem.cpp:185 sourceitem.cpp:169
-msgid "(cycle)"
+#: tabview.cpp:72
+msgid "Move to Bottom"
 msgstr ""
 
-#: tracedata.cpp:157
-msgid "Abstract Item"
+#: tabview.cpp:76
+msgid "Move to Bottom Left"
 msgstr ""
 
-#: tracedata.cpp:158
-msgid "Cost Item"
+#: tabview.cpp:77 tabview.cpp:94 treemap.cpp:2908
+msgid "Bottom Left"
+msgstr "Chwith Gwaelod"
+
+#: tabview.cpp:79
+msgid "Move Area To"
 msgstr ""
 
-#: tracedata.cpp:159
-msgid "Part Source Line"
+#: tabview.cpp:81
+msgid "Hide This Tab"
 msgstr ""
 
-#: tracedata.cpp:160
-msgid "Source Line"
+#: tabview.cpp:82
+msgid "Hide Area"
 msgstr ""
 
-#: tracedata.cpp:161
-msgid "Part Line Call"
+#: tabview.cpp:95
+msgid "Show Hidden On"
 msgstr ""
 
-#: tracedata.cpp:162
-msgid "Line Call"
+#: tabview.cpp:242
+msgid "(No profile data file loaded)"
 msgstr ""
 
-#: tracedata.cpp:163
-msgid "Part Jump"
+#: tabview.cpp:281
+msgid "Types"
+msgstr "Mathau"
+
+#: tabview.cpp:284
+msgid "Callers"
 msgstr ""
 
-#: tracedata.cpp:164
-msgid "Jump"
+#: tabview.cpp:287
+msgid "All Callers"
 msgstr ""
 
-#: tracedata.cpp:165
-msgid "Part Instruction"
+#: tabview.cpp:290
+msgid "Caller Map"
 msgstr ""
 
-#: tracedata.cpp:166
-msgid "Instruction"
+#: tabview.cpp:293
+msgid "Source"
+msgstr "Tarddiad"
+
+#: tabview.cpp:297
+msgid "Parts"
+msgstr "Rhannau"
+
+#: tabview.cpp:300
+msgid "Call Graph"
 msgstr ""
 
-#: tracedata.cpp:167
-msgid "Part Instruction Jump"
+#: tabview.cpp:303
+msgid "Callees"
 msgstr ""
 
-#: tracedata.cpp:168
-msgid "Instruction Jump"
+#: tabview.cpp:306
+msgid "All Callees"
 msgstr ""
 
-#: tracedata.cpp:169
-msgid "Part Instruction Call"
+#: tabview.cpp:310
+msgid "Callee Map"
 msgstr ""
 
-#: tracedata.cpp:170
-msgid "Instruction Call"
+#: instrview.cpp:131 tabview.cpp:313
+msgid "Assembler"
 msgstr ""
 
-#: tracedata.cpp:171
-msgid "Part Call"
+#: tabview.cpp:553
+msgid ""
+"<b>Information Tabs</b>"
+"<p>This widget shows information for the current selected function in different "
+"tabs: "
+"<ul>"
+"<li>The Costs tab shows a list of available event types and the inclusive and "
+"self costs regarding to these types.</li>"
+"<li>The Parts tab shows a list of trace parts if the trace consists of more "
+"than one part (otherwise, this tab is hided). The cost of the selected function "
+"spent in the different parts together with the calls happening is shown.</li>"
+"<li>The Call Lists tab shows direct callers and callees of the function in more "
+"detail.</li>"
+"<li>The Coverage tab shows the same is the Call Lists tab, but not only direct "
+"callers and callees but also indirect ones.</li>"
+"<li>The Call Graph tab shows a graphical visualization of the calls done by "
+"this function.</li>"
+"<li>The Source tab presents annotated source code if debugging information and "
+"the source file is available.</li>"
+"<li>The Assembler tab presents annotated assembler code if trace information on "
+"instruction level is available.</li></ul>For more information, see the <em>"
+"What's This?</em> help of the corresponding tab widget</p>"
 msgstr ""
 
-#: tracedata.cpp:172
-msgid "Call"
+#: tabview.cpp:630
+msgid "(No Data loaded)"
 msgstr ""
 
-#: tracedata.cpp:173
-msgid "Part Function"
+#: tabview.cpp:631
+msgid "(No function selected)"
 msgstr ""
 
-#: tracedata.cpp:174
-msgid "Function Source File"
+#: tips.txt:3
+msgid ""
+"<p>...that the <em>What's This?</em> help for every GUI widget\n"
+"in KCachegrind contains detailed usage information for this widget?\n"
+"It is highly recommended to read at least these help texts on first\n"
+"use. Request <em>What's This?</em> help by pressing\n"
+"Shift+F1 and clicking on the widget.</p>\n"
 msgstr ""
 
-#. i18n: file dumpselectionbase.ui line 300
-#: rc.cpp:144 rc.cpp:273 rc.cpp:318 rc.cpp:342 tracedata.cpp:175
-#, no-c-format
-msgid "Function"
-msgstr "Ffwythiant"
+#: tips.txt:12
+msgid ""
+"<p>...that you can get profile information at instruction level\n"
+"with Calltree when you provide the option <em>--dump-instr=yes</em>?\n"
+"Use the Assembler View for the instruction annotations.\n"
+"</p>\n"
+msgstr ""
 
-#: tracedata.cpp:176
-msgid "Function Cycle"
+#: tips.txt:20
+msgid ""
+"<p>...that you can use Alt-Left/Right keys of your keyboard to go\n"
+"back/forward in the active object history ?</p>\n"
 msgstr ""
 
-#: tracedata.cpp:177
-msgid "Part Class"
+#: tips.txt:26
+msgid ""
+"<p>...that you can navigate in the Callee/Caller Map View using\n"
+"arrow keys? Use Left/Right to change to siblings of the current\n"
+"item; use Up/Down to go one nesting level up/down. To select\n"
+"the current item, press Space, and to activate it, press Return.\n"
+"</p>\n"
 msgstr ""
 
-#: tracedata.cpp:178
-msgid "Class"
-msgstr "Dosbarth"
+#: tips.txt:35
+msgid ""
+"<p>...that you can navigate in the Call Graph View using\n"
+"arrow keys? Use Up/Down to go one calling level up/down, alternating\n"
+"between calls and functions. Use Left/Right to change to siblings of a current\n"
+"selected call. To activate the current item, press Return.\n"
+"</p>\n"
+msgstr ""
 
-#: tracedata.cpp:179
-msgid "Part Source File"
+#: tips.txt:44
+msgid ""
+"<p>...that you can rapidly locate a function by entering part of its\n"
+"name (case-insensitive) into the edit line of the toolbar\n"
+"and hit return?</p>\n"
 msgstr ""
 
-#: tracedata.cpp:180
-msgid "Source File"
-msgstr "Ffeil Tarddiad"
+#: tips.txt:51
+msgid ""
+"<p>...that you can assign custom colors to \n"
+"ELF objects/C++ Classes/Source Files for graph coloring\n"
+"in <em>Settings->Configure KCachegrind...</em>?</p>\n"
+msgstr ""
 
-#: tracedata.cpp:181
-msgid "Part ELF Object"
+#: tips.txt:58
+msgid ""
+"<p>...that you can see if debug info is available for a selected \n"
+"function by looking at the location label in the Info tab or\n"
+"the source listing header in the source tab?</p>\n"
+"<p>There must be the name of the source file (with extension).\n"
+"If KCachegrind still doesn't show the source, make sure that you\n"
+"have added the directory of the source file to the\n"
+"<em>Source Directories</em> list in the configuration.\n"
 msgstr ""
 
-#: tracedata.cpp:182
-msgid "ELF Object"
+#: tips.txt:69
+msgid ""
+"<p>...that you can configure whether KCachgrind should\n"
+"show absolute event counts or relative ones (percentage display)?</p>\n"
 msgstr ""
 
-#: partview.cpp:46 tracedata.cpp:183
-msgid "Profile Part"
+#: tips.txt:75
+msgid ""
+"<p>...that you can configure the maximum number of items\n"
+"for all function lists in KCachegrind? Limiting the number\n"
+"of items is done to get a fast reacting GUI. The last item in\n"
+"the list will show you the number of skipped functions, together\n"
+"with a cost condition for these skipped functions.</p>\n"
+"<p>To activate a function with small costs, search for it and select\n"
+"it in the flat profile. Selecting functions with small cost will\n"
+"temporarily add them to the flat profile list.</p>\n"
 msgstr ""
 
-#: tracedata.cpp:184
-msgid "Program Trace"
+#: tips.txt:87
+msgid ""
+"<p>...that the Coverage tab - in contrast to the Call Lists tab -\n"
+"shows <em>all</em> functions that are calling the selected function\n"
+"(upper part) / are called by the selected function (bottom part),\n"
+"no matter how many function are between them on the stack?</p>\n"
+"<p>Examples:</p>\n"
+"<p>An entry in the upper list for function foo1() with a value of 50%\n"
+"with function bar() selected means that 50% of all the cost of function\n"
+"bar() happened while called from function foo1().</p>\n"
+"<p>An entry in the bottom list for function foo2() with a value of 50%\n"
+"with function bar() selected means that 50% of all the cost of function\n"
+"bar() happened while calling foo2() from bar().</p>\n"
 msgstr ""
 
-#: tracedata.cpp:245
-msgid "%1 from %2"
+#: tips.txt:102
+msgid ""
+"<p>...that waiting for the tool tip inside of a tree map\n"
+"shows the list of names of the nested rectangles the mouse\n"
+"pointer is over?</p>\n"
+"<p>Items from this list can be selected by pressing the right\n"
+"mouse button.</p>\n"
 msgstr ""
 
-#: partgraph.cpp:423 tracedata.cpp:253 tracedata.cpp:258 tracedata.cpp:2828
-#: tracedata.cpp:3245 tracedata.cpp:3331 tracedata.cpp:4169 tracedata.cpp:4177
-#: tracedata.cpp:4242
-msgid "(unknown)"
-msgstr "(anhysbys)"
+#: tips.txt:111
+msgid ""
+"<p>...that you can constrain the cost counts shown to only a\n"
+"few parts of the whole trace by selecting these parts in the\n"
+"\"Trace Selection\" Dockable?</p>\n"
+"<p>To generate multiple parts in a profiling run with\n"
+"cachegrind, use e.g. option --cachedumps=xxx for parts\n"
+"of a length of xxx basic blocks (A basic block is a run\n"
+"of not-branching assembler statements inside of your program\n"
+"code).</p>\n"
+msgstr ""
 
-#: tracedata.cpp:2587
-msgid "(no caller)"
+#. i18n: file dumpselectionbase.ui line 824
+#: configdlg.cpp:58 rc.cpp:249
+#, no-c-format
+msgid "ELF Objects"
 msgstr ""
 
-#: tracedata.cpp:2594 tracedata.cpp:2613
-msgid "%1 via %2"
+#: configdlg.cpp:60
+msgid "Source Files"
 msgstr ""
 
-#: tracedata.cpp:2603
-msgid "(no callee)"
+#: configdlg.cpp:61
+msgid "C++ Classes"
 msgstr ""
 
-#: tracedata.cpp:4471
-msgid "(not found)"
-msgstr "(heb ei ganfod)"
+#: configdlg.cpp:62
+msgid "Function (no Grouping)"
+msgstr ""
 
-#: tracedata.cpp:5021
-msgid "Recalculating Function Cycles..."
+#: configdlg.cpp:157 configdlg.cpp:350 configdlg.cpp:371
+msgid "(always)"
+msgstr ""
+
+#: configdlg.cpp:210
+msgid "KCachegrind Configuration"
+msgstr ""
+
+#: configdlg.cpp:211
+msgid ""
+"The Maximum Number of List Items should be below 500.The previous set value "
+"(%1) will still be used."
+msgstr ""
+
+#: configdlg.cpp:384
+msgid "Choose Source Folder"
 msgstr ""
 
 #. i18n: file dumpselectionbase.ui line 550
@@ -216,11 +344,11 @@ msgstr ""
 msgid "Unhide Hidden Parts"
 msgstr ""
 
-#: partselection.cpp:302 toplevel.cpp:1692
+#: partselection.cpp:302 toplevel.cpp:1687
 msgid "Go Back"
 msgstr "Ewch yn ?l"
 
-#: callgraphview.cpp:2571 partselection.cpp:320
+#: callgraphview.cpp:2570 partselection.cpp:320
 msgid "Visualization"
 msgstr "Delweddu"
 
@@ -276,8 +404,192 @@ msgstr "Dangos Gwybodaeth"
 msgid "(no trace loaded)"
 msgstr ""
 
-#: costtypeview.cpp:42
-msgid "Event Type"
+#. i18n: file dumpselectionbase.ui line 950
+#: callmapview.cpp:61 rc.cpp:276 rc.cpp:321
+#, no-c-format
+msgid "Location"
+msgstr "Lleoliad"
+
+#. i18n: file dumpselectionbase.ui line 754
+#: callmapview.cpp:63 rc.cpp:234 rc.cpp:339
+#, no-c-format
+msgid "Calls"
+msgstr ""
+
+#: callmapview.cpp:98
+msgid ""
+"<b>Caller Map</b>"
+"<p>This graph shows the nested hierarchy of all callers of the current "
+"activated function. Each colored rectangle represents a function; its size "
+"tries to be proportional to the cost spent therein while the active function is "
+"running (however, there are drawing constrains).</p>"
+msgstr ""
+
+#: callmapview.cpp:105
+msgid ""
+"<b>Call Map</b>"
+"<p>This graph shows the nested hierarchy of all callees of the current "
+"activated function. Each colored rectangle represents a function; its size "
+"tries to be proportional to the cost spent therein while the active function is "
+"running (however, there are drawing constrains).</p>"
+msgstr ""
+
+#: callmapview.cpp:113
+msgid ""
+"<p>Appearance options can be found in the in the context menu. To get exact "
+"size proportions, choose 'Hide incorrect borders'. As this mode can be <em>"
+"very</em> time consuming, you may want to limit the maximum drawn nesting level "
+"before. 'Best' determinates the split direction for children from the aspect "
+"ratio of the parent. 'Always Best' decides on remaining space for each sibling. "
+"'Ignore Proportions' takes space for function name drawing <em>before</em> "
+"drawing children. Note that size proportions can get <em>heavily</em> wrong.</p>"
+"<p>This is a <em>TreeMap</em> widget. Keyboard navigation is available with the "
+"left/right arrow keys for traversing siblings, and up/down arrow keys to go a "
+"nesting level up/down. <em>Return</em> activates the current item.</p>"
+msgstr ""
+
+#: callmapview.cpp:167
+msgid "Go To"
+msgstr "Ewch I"
+
+#: callmapview.cpp:184
+msgid "Stop at Depth"
+msgstr "Aros wrth Ddyfnder"
+
+#: callmapview.cpp:187 treemap.cpp:3101
+msgid "No Depth Limit"
+msgstr "Dim Cyfyngiad Dyfnder"
+
+#: callmapview.cpp:190
+msgid "Depth 10"
+msgstr ""
+
+#: callmapview.cpp:192
+msgid "Depth 15"
+msgstr ""
+
+#: callmapview.cpp:194
+msgid "Depth 20"
+msgstr ""
+
+#: callmapview.cpp:198 treemap.cpp:3107
+msgid "Depth of '%1' (%2)"
+msgstr "Dyfnder o '%1' (%2)"
+
+#: callmapview.cpp:204
+msgid "Decrement Depth (to %1)"
+msgstr ""
+
+#: callmapview.cpp:205
+msgid "Increment Depth (to %1)"
+msgstr ""
+
+#: callmapview.cpp:209
+msgid "Stop at Function"
+msgstr ""
+
+#: callmapview.cpp:210
+msgid "No Function Limit"
+msgstr ""
+
+#: callmapview.cpp:240
+msgid "Stop at Area"
+msgstr "Aros wrth Ardal"
+
+#: callmapview.cpp:243 treemap.cpp:3039
+msgid "No Area Limit"
+msgstr "Dim Cyfyngiad Ardal"
+
+#: callmapview.cpp:246
+msgid "50 Pixels"
+msgstr ""
+
+#: callmapview.cpp:248
+msgid "100 Pixels"
+msgstr ""
+
+#: callmapview.cpp:250
+msgid "200 Pixels"
+msgstr ""
+
+#: callmapview.cpp:252
+msgid "500 Pixels"
+msgstr ""
+
+#: callmapview.cpp:258 treemap.cpp:3045
+msgid "Area of '%1' (%2)"
+msgstr "Ardal '%1' (%2)"
+
+#: callmapview.cpp:264 treemap.cpp:3071
+msgid "Double Area Limit (to %1)"
+msgstr "Cyfyngiad Ardal Dwbl (i %1)"
+
+#: callmapview.cpp:266
+msgid "Half Area Limit (to %1)"
+msgstr ""
+
+#: callmapview.cpp:273
+msgid "Visualisation"
+msgstr ""
+
+#: callmapview.cpp:277
+msgid "Split Direction"
+msgstr ""
+
+#: callmapview.cpp:279
+msgid "Skip Incorrect Borders"
+msgstr ""
+
+#: callmapview.cpp:284
+msgid "Border Width"
+msgstr "Lled Border"
+
+#: callmapview.cpp:285
+msgid "Border 0"
+msgstr ""
+
+#: callmapview.cpp:288
+msgid "Border 1"
+msgstr ""
+
+#: callmapview.cpp:290
+msgid "Border 2"
+msgstr ""
+
+#: callmapview.cpp:292
+msgid "Border 3"
+msgstr ""
+
+#: callmapview.cpp:297
+msgid "Draw Symbol Names"
+msgstr ""
+
+#: callmapview.cpp:298
+msgid "Draw Cost"
+msgstr ""
+
+#: callmapview.cpp:299
+msgid "Draw Location"
+msgstr ""
+
+#: callmapview.cpp:300
+msgid "Draw Calls"
+msgstr ""
+
+#: callmapview.cpp:321 treemap.cpp:2889
+msgid "Shading"
+msgstr "Arliwio"
+
+#: callmapview.cpp:431
+msgid "Call Map: Current is '%1'"
+msgstr ""
+
+#: callmapview.cpp:599
+msgid "(no function)"
+msgstr ""
+
+#: callmapview.cpp:741 callmapview.cpp:858
+msgid "(no call)"
 msgstr ""
 
 #. i18n: file dumpselectionbase.ui line 917
@@ -287,6 +599,20 @@ msgstr ""
 msgid "Incl."
 msgstr ""
 
+#: coverageview.cpp:48 coverageview.cpp:54
+msgid "Distance"
+msgstr "Pellder"
+
+#. i18n: file dumpselectionbase.ui line 928
+#: coverageview.cpp:49 partview.cpp:49 rc.cpp:270 rc.cpp:315
+#, no-c-format
+msgid "Called"
+msgstr ""
+
+#: callview.cpp:48 coverageview.cpp:50
+msgid "Caller"
+msgstr ""
+
 #. i18n: file functionselectionbase.ui line 62
 #: costtypeview.cpp:44 coverageview.cpp:53 partview.cpp:48 rc.cpp:303
 #: rc.cpp:312
@@ -294,83 +620,267 @@ msgstr ""
 msgid "Self"
 msgstr ""
 
-#: costtypeview.cpp:45
-msgid "Short"
-msgstr "Byr"
+#: coverageview.cpp:55
+msgid "Calling"
+msgstr ""
 
-#: costtypeview.cpp:47
-msgid "Formula"
-msgstr "Fformiwla"
+#: callview.cpp:52 coverageview.cpp:56
+msgid "Callee"
+msgstr ""
 
-#: costtypeview.cpp:81
+#: coverageview.cpp:90
 msgid ""
-"<b>Cost Types List</b>"
-"<p>This list shows all cost types available and what the self/inclusive cost of "
-"the current selected function is for that cost type.</p>"
-"<p>By choosing a cost type from the list, you change the cost type of costs "
-"shown all over KCachegrind to be the selected one.</p>"
+"<b>List of all Callers</b>"
+"<p>This list shows all functions calling the current selected one, either "
+"directly or with several functions in-between on the stack; the number of "
+"functions in-between plus one is called the <em>Distance</em> "
+"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
+"calls C, i.e. A => B => C. The distance here is 2).</p>"
+"<p>Absolute cost shown is the cost spent in the selected function while a "
+"listed function is active; relative cost is the percentage of all cost spent in "
+"the selected function while the listed one is active. The cost graphic shows "
+"logarithmic percentage with a different color for each distance.</p>"
+"<p>As there can be many calls from the same function, the distance column "
+"sometimes shows the range of distances for all calls happening; then, in "
+"parentheses, there is the medium distance, i.e. the distance where most of the "
+"call costs happened.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 msgstr ""
 
-#: costtypeview.cpp:98
-msgid "Set Secondary Event Type"
+#: coverageview.cpp:120
+msgid ""
+"<b>List of all Callees</b>"
+"<p>This list shows all functions called by the current selected one, either "
+"directly or with several function in-between on the stack; the number of "
+"function in-between plus one is called the <em>Distance</em> "
+"(e.g. for function A,B,C there exists a call from A to C when A calls B and B "
+"calls C, i.e. A => B => C. The distance here is 2).</p>"
+"<p>Absolute cost shown is the cost spent in the listed function while the "
+"selected is active; relative cost is the percentage of all cost spent in the "
+"listed function while the selected one is active. The cost graphic always shows "
+"logarithmic percentage with a different color for each distance.</p>"
+"<p>As there can be many calls to the same function, the distance column "
+"sometimes shows the range of distances for all calls happening; then, in "
+"parentheses, there is the medium distance, i.e. the distance where most of the "
+"call costs happened.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 msgstr ""
 
-#: costtypeview.cpp:100
-msgid "Remove Secondary Event Type"
+#: callgraphview.cpp:2396 callgraphview.cpp:2400 callgraphview.cpp:2418
+#: callview.cpp:123 callview.cpp:128 coverageview.cpp:166 instrview.cpp:191
+#: sourceview.cpp:116
+msgid "Go to '%1'"
+msgstr "Ewch I '%1'"
+
+#: callview.cpp:45 instrview.cpp:127 sourceview.cpp:52
+msgid "Cost 2"
 msgstr ""
 
-#: costtypeview.cpp:105
-msgid "Edit Long Name"
+#: callview.cpp:47 callview.cpp:51
+msgid "Count"
+msgstr "Cyfrif"
+
+#: callview.cpp:85
+msgid ""
+"<b>List of direct Callers</b>"
+"<p>This list shows all functions calling the current selected one directly, "
+"together with a call count and the cost spent in the current selected function "
+"while being called from the function from the list.</p>"
+"<p>An icon instead of an inclusive cost specifies that this is a call inside of "
+"a recursive cycle. An inclusive cost makes no sense here.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 msgstr ""
 
-#: costtypeview.cpp:106
-msgid "Edit Short Name"
+#: callview.cpp:98
+msgid ""
+"<b>List of direct Callees</b>"
+"<p>This list shows all functions called by the current selected one directly, "
+"together with a call count and the cost spent in this function while being "
+"called from the selected function.</p>"
+"<p>Selecting a function makes it the current selected one of this information "
+"panel. If there are two panels (Split mode), the function of the other panel is "
+"changed instead.</p>"
 msgstr ""
 
-#: costtypeview.cpp:107
-msgid "Edit Formula"
+#: instritem.cpp:106 sourceitem.cpp:86
+msgid "Active call to '%1'"
 msgstr ""
 
-#: costtypeview.cpp:115
-msgid "New Cost Type ..."
+#: instritem.cpp:108 sourceitem.cpp:88
+msgid ""
+"_n: %n call to '%1'\n"
+"%n calls to '%1'"
 msgstr ""
 
-#: costtypeview.cpp:149 costtypeview.cpp:154
-#, c-format
-msgid "New%1"
+#: instritem.cpp:137
+msgid "Jump %1 of %2 times to 0x%3"
 msgstr ""
 
-#: costtypeview.cpp:155
-#, c-format
-msgid "New Cost Type %1"
+#: instritem.cpp:142
+msgid "Jump %1 times to 0x%2"
 msgstr ""
 
-#: sourceitem.cpp:125
-msgid "Jump %1 of %2 times to %3"
+#: instritem.cpp:185 sourceitem.cpp:169
+msgid "(cycle)"
 msgstr ""
 
-#: sourceitem.cpp:130
-msgid "Jump %1 times to %2"
+#: tracedata.cpp:153
+msgid "Abstract Item"
 msgstr ""
 
-#: costlistitem.cpp:60
-#, c-format
-msgid ""
-"_n: (%n item skipped)\n"
-"(%n items skipped)"
+#: tracedata.cpp:154
+msgid "Cost Item"
 msgstr ""
 
-#: traceitemview.cpp:53
-msgid "No description available"
-msgstr "Dim disgrifiad ar gael"
+#: tracedata.cpp:155
+msgid "Part Source Line"
+msgstr ""
+
+#: tracedata.cpp:156
+msgid "Source Line"
+msgstr ""
+
+#: tracedata.cpp:157
+msgid "Part Line Call"
+msgstr ""
+
+#: tracedata.cpp:158
+msgid "Line Call"
+msgstr ""
+
+#: tracedata.cpp:159
+msgid "Part Jump"
+msgstr ""
+
+#: tracedata.cpp:160
+msgid "Jump"
+msgstr ""
+
+#: tracedata.cpp:161
+msgid "Part Instruction"
+msgstr ""
+
+#: tracedata.cpp:162
+msgid "Instruction"
+msgstr ""
+
+#: tracedata.cpp:163
+msgid "Part Instruction Jump"
+msgstr ""
+
+#: tracedata.cpp:164
+msgid "Instruction Jump"
+msgstr ""
+
+#: tracedata.cpp:165
+msgid "Part Instruction Call"
+msgstr ""
+
+#: tracedata.cpp:166
+msgid "Instruction Call"
+msgstr ""
+
+#: tracedata.cpp:167
+msgid "Part Call"
+msgstr ""
+
+#: tracedata.cpp:168
+msgid "Call"
+msgstr ""
+
+#: tracedata.cpp:169
+msgid "Part Function"
+msgstr ""
+
+#: tracedata.cpp:170
+msgid "Function Source File"
+msgstr ""
+
+#. 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 "Ffwythiant"
+
+#: tracedata.cpp:172
+msgid "Function Cycle"
+msgstr ""
+
+#: tracedata.cpp:173
+msgid "Part Class"
+msgstr ""
+
+#: tracedata.cpp:174
+msgid "Class"
+msgstr "Dosbarth"
+
+#: tracedata.cpp:175
+msgid "Part Source File"
+msgstr ""
+
+#: tracedata.cpp:176
+msgid "Source File"
+msgstr "Ffeil Tarddiad"
+
+#: tracedata.cpp:177
+msgid "Part ELF Object"
+msgstr ""
+
+#: tracedata.cpp:178
+msgid "ELF Object"
+msgstr ""
+
+#: partview.cpp:46 tracedata.cpp:179
+msgid "Profile Part"
+msgstr ""
+
+#: tracedata.cpp:180
+msgid "Program Trace"
+msgstr ""
+
+#: tracedata.cpp:241
+msgid "%1 from %2"
+msgstr ""
+
+#: 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 "(anhysbys)"
+
+#: tracedata.cpp:2583
+msgid "(no caller)"
+msgstr ""
+
+#: tracedata.cpp:2590 tracedata.cpp:2609
+msgid "%1 via %2"
+msgstr ""
+
+#: tracedata.cpp:2599
+msgid "(no callee)"
+msgstr ""
+
+#: tracedata.cpp:4467
+msgid "(not found)"
+msgstr "(heb ei ganfod)"
+
+#: tracedata.cpp:5017
+msgid "Recalculating Function Cycles..."
+msgstr ""
 
 #. i18n: file partselectionbase.ui line 16
-#: rc.cpp:324 toplevel.cpp:281 toplevel.cpp:581
+#: rc.cpp:324 toplevel.cpp:276 toplevel.cpp:576
 #, no-c-format
 msgid "Parts Overview"
 msgstr ""
 
-#: toplevel.cpp:288
+#: toplevel.cpp:283
 msgid ""
 "<b>The Parts Overview</b>"
 "<p>A trace consists of multiple trace parts when there are several profile data "
@@ -390,11 +900,11 @@ msgid ""
 "to show the costs of its callees.</li></ul></p>"
 msgstr ""
 
-#: toplevel.cpp:318
+#: toplevel.cpp:313
 msgid "Top Cost Call Stack"
 msgstr ""
 
-#: toplevel.cpp:320
+#: toplevel.cpp:315
 msgid ""
 "<b>The Top Cost Call Stack</b>"
 "<p>This is a purely fictional 'most probable' call stack. It is built up by "
@@ -404,11 +914,11 @@ msgid ""
 "from the function in the line above.</p>"
 msgstr ""
 
-#: toplevel.cpp:333
+#: toplevel.cpp:328
 msgid "Flat Profile"
 msgstr ""
 
-#: toplevel.cpp:343
+#: toplevel.cpp:338
 msgid ""
 "<b>The Flat Profile</b>"
 "<p>The flat profile contains a group and a function selection list. The group "
@@ -421,12 +931,12 @@ msgid ""
 msgstr ""
 
 #. i18n: file dumpselectionbase.ui line 16
-#: rc.cpp:84 toplevel.cpp:357 toplevel.cpp:609
+#: rc.cpp:84 toplevel.cpp:352 toplevel.cpp:604
 #, no-c-format
 msgid "Profile Dumps"
 msgstr ""
 
-#: toplevel.cpp:367
+#: toplevel.cpp:362
 msgid ""
 "<b>Profile Dumps</b>"
 "<p>This dockable shows in the top part the list of loadable profile dumps in "
@@ -454,88 +964,88 @@ msgid ""
 "dump.</ul></p>"
 msgstr ""
 
-#: toplevel.cpp:455
+#: toplevel.cpp:450
 msgid "&Duplicate"
 msgstr "&Dyblyg"
 
-#: toplevel.cpp:459
+#: toplevel.cpp:454
 msgid ""
 "<b>Duplicate Current Layout</b>"
 "<p>Make a copy of the current layout.</p>"
 msgstr ""
 
-#: toplevel.cpp:466
+#: toplevel.cpp:461
 msgid ""
 "<b>Remove Current Layout</b>"
 "<p>Delete current layout and make the previous active.</p>"
 msgstr ""
 
-#: toplevel.cpp:470
+#: toplevel.cpp:465
 msgid "&Go to Next"
 msgstr ""
 
-#: toplevel.cpp:474
+#: toplevel.cpp:469
 msgid "Go to Next Layout"
 msgstr ""
 
-#: toplevel.cpp:477
+#: toplevel.cpp:472
 msgid "&Go to Previous"
 msgstr ""
 
-#: toplevel.cpp:481
+#: toplevel.cpp:476
 msgid "Go to Previous Layout"
 msgstr ""
 
-#: toplevel.cpp:484
+#: toplevel.cpp:479
 msgid "&Restore to Default"
 msgstr ""
 
-#: toplevel.cpp:487
+#: toplevel.cpp:482
 msgid "Restore Layouts to Default"
 msgstr ""
 
-#: toplevel.cpp:490
+#: toplevel.cpp:485
 msgid "&Save as Default"
 msgstr "&Cadw fel Rhagosodyn"
 
-#: toplevel.cpp:493
+#: toplevel.cpp:488
 msgid "Save Layouts as Default"
 msgstr ""
 
-#: toplevel.cpp:504
+#: toplevel.cpp:499
 msgid "<b>New</b><p>Open new empty KCachegrind window.</p>"
 msgstr ""
 
-#: toplevel.cpp:507
+#: toplevel.cpp:502
 msgid "&Add..."
 msgstr "Ychw&anegu..."
 
-#: toplevel.cpp:510
+#: toplevel.cpp:505
 msgid ""
 "<b>Add Profile Data</b>"
 "<p>This opens an additional profile data file in the current window.</p>"
 msgstr ""
 
-#: toplevel.cpp:522
+#: toplevel.cpp:517
 msgid "<b>Reload Profile Data</b><p>This loads any new created parts, too.</p>"
 msgstr ""
 
-#: toplevel.cpp:526
+#: toplevel.cpp:521
 msgid "&Export Graph"
 msgstr ""
 
-#: toplevel.cpp:530
+#: toplevel.cpp:525
 msgid ""
 "<b>Export Call Graph</b>"
 "<p>Generates a file with extension .dot for the tools of the GraphViz "
 "package.</p>"
 msgstr ""
 
-#: toplevel.cpp:536
+#: toplevel.cpp:531
 msgid "&Force Dump"
 msgstr ""
 
-#: toplevel.cpp:545
+#: toplevel.cpp:540
 msgid ""
 "<b>Force Dump</b>"
 "<p>This forces a dump for a Callgrind profile run in the current directory. "
@@ -554,59 +1064,59 @@ msgid ""
 "resizing a window of the program.</p>"
 msgstr ""
 
-#: toplevel.cpp:570
+#: toplevel.cpp:565
 msgid ""
 "<b>Open Profile Data</b>"
 "<p>This opens a profile data file, with possible multiple parts</p>"
 msgstr ""
 
-#: toplevel.cpp:586
+#: toplevel.cpp:581
 msgid "Show/Hide the Parts Overview Dockable"
 msgstr ""
 
-#: toplevel.cpp:590
+#: toplevel.cpp:585
 msgid "Call Stack"
 msgstr "Pentwr galwadau"
 
-#: toplevel.cpp:595
+#: toplevel.cpp:590
 msgid "Show/Hide the Call Stack Dockable"
 msgstr ""
 
 #. i18n: file functionselectionbase.ui line 16
-#: rc.cpp:297 toplevel.cpp:599
+#: rc.cpp:297 toplevel.cpp:594
 #, no-c-format
 msgid "Function Profile"
 msgstr ""
 
-#: toplevel.cpp:604
+#: toplevel.cpp:599
 msgid "Show/Hide the Function Profile Dockable"
 msgstr ""
 
-#: toplevel.cpp:614
+#: toplevel.cpp:609
 msgid "Show/Hide the Profile Dumps Dockable"
 msgstr ""
 
-#: toplevel.cpp:619
+#: toplevel.cpp:614
 msgid "Show Relative Costs"
 msgstr ""
 
-#: toplevel.cpp:626
+#: toplevel.cpp:621
 msgid "Show Absolute Costs"
 msgstr ""
 
-#: toplevel.cpp:629
+#: toplevel.cpp:624
 msgid "Show relative instead of absolute costs"
 msgstr ""
 
-#: toplevel.cpp:633
+#: toplevel.cpp:628
 msgid "Percentage Relative to Parent"
 msgstr ""
 
-#: toplevel.cpp:639
+#: toplevel.cpp:634
 msgid "Show percentage costs relative to parent"
 msgstr ""
 
-#: toplevel.cpp:643
+#: toplevel.cpp:638
 msgid ""
 "<b>Show percentage costs relative to parent</b>"
 "<p>If this is switched off, percentage costs are always shown relative to the "
@@ -633,15 +1143,15 @@ msgid ""
 "<p>(*) Only if function grouping is switched on (e.g. ELF object grouping)."
 msgstr ""
 
-#: toplevel.cpp:658
+#: toplevel.cpp:653
 msgid "Do Cycle Detection"
 msgstr ""
 
-#: toplevel.cpp:664
+#: toplevel.cpp:659
 msgid "Skip Cycle Detection"
 msgstr ""
 
-#: toplevel.cpp:667
+#: toplevel.cpp:662
 msgid ""
 "<b>Detect recursive cycles</b>"
 "<p>If this is switched off, the treemap drawing will show black areas when a "
@@ -656,688 +1166,228 @@ msgid ""
 "switch this off."
 msgstr ""
 
-#: toplevel.cpp:689 toplevel.cpp:729
+#: toplevel.cpp:684 toplevel.cpp:724
 msgid "Go back in function selection history"
 msgstr ""
 
-#: toplevel.cpp:695 toplevel.cpp:741
+#: toplevel.cpp:690 toplevel.cpp:736
 msgid "Go forward in function selection history"
 msgstr ""
 
-#: toplevel.cpp:701 toplevel.cpp:715
+#: toplevel.cpp:696 toplevel.cpp:710
 msgid ""
 "<b>Go Up</b>"
 "<p>Go to last selected caller of current function. If no caller was visited, "
 "use that with highest cost.</p>"
 msgstr ""
 
-#: toplevel.cpp:707
+#: toplevel.cpp:702
 msgid "&Up"
 msgstr "I &Fyny"
 
-#: toplevel.cpp:746 toplevel.cpp:1651
+#: toplevel.cpp:741 toplevel.cpp:1646
 msgid "Primary Event Type"
 msgstr ""
 
-#: toplevel.cpp:748
+#: toplevel.cpp:743
 msgid "Select primary event type of costs"
 msgstr ""
 
-#: toplevel.cpp:758 toplevel.cpp:1654
+#: toplevel.cpp:753 toplevel.cpp:1649
 msgid "Secondary Event Type"
 msgstr ""
 
-#: toplevel.cpp:760
+#: toplevel.cpp:755
 msgid "Select secondary event type for cost e.g. shown in annotations"
 msgstr ""
 
-#: functionselection.cpp:243 toplevel.cpp:768
+#: functionselection.cpp:243 toplevel.cpp:763
 msgid "Grouping"
 msgstr ""
 
-#: toplevel.cpp:771
+#: toplevel.cpp:766
 msgid "Select how functions are grouped into higher level cost items"
 msgstr ""
 
-#: functionselection.cpp:52 toplevel.cpp:777
+#: functionselection.cpp:52 toplevel.cpp:772
 msgid "(No Grouping)"
 msgstr ""
 
-#: toplevel.cpp:787
+#: toplevel.cpp:782
 msgid "Split"
 msgstr ""
 
-#: toplevel.cpp:791
+#: toplevel.cpp:786
 msgid "Show two information panels"
 msgstr ""
 
-#: toplevel.cpp:795
-msgid "Split Horizontal"
+#: toplevel.cpp:790
+#, fuzzy
+msgid "SplitQt::Horizontal"
 msgstr "Hollti'n Lorweddol"
 
-#: toplevel.cpp:800
-msgid "Change Split Orientation when main window is split."
+#: toplevel.cpp:795
+msgid "Change Split Qt::Orientation when main window is split."
 msgstr ""
 
-#: toplevel.cpp:808
+#: toplevel.cpp:803
 msgid "Tip of the &Day..."
 msgstr "Awgrymiad y &Dydd ..."
 
-#: toplevel.cpp:809
+#: toplevel.cpp:804
 msgid "Show \"Tip of the Day\""
 msgstr ""
 
-#: toplevel.cpp:1012 toplevel.cpp:1061
+#: toplevel.cpp:1007 toplevel.cpp:1056
 msgid ""
 "cachegrind.out* callgrind.out*|Callgrind Profile Data\n"
 "*|All Files"
 msgstr ""
 
-#: toplevel.cpp:1014
+#: toplevel.cpp:1009
 msgid "Select Callgrind Profile Data"
 msgstr ""
 
-#: toplevel.cpp:1063
+#: toplevel.cpp:1058
 msgid "Add Callgrind Profile Data"
 msgstr ""
 
-#: toplevel.cpp:1221 toplevel.cpp:1574
+#: toplevel.cpp:1216 toplevel.cpp:1569
 msgid "(Hidden)"
 msgstr ""
 
-#: toplevel.cpp:1626
+#: toplevel.cpp:1621
 msgid "Hide"
 msgstr "Cuddio"
 
-#: toplevel.cpp:1659
+#: toplevel.cpp:1654
 msgid "Show Absolute Cost"
 msgstr ""
 
-#: toplevel.cpp:1662
+#: toplevel.cpp:1657
 msgid "Show Relative Cost"
 msgstr ""
 
-#: toplevel.cpp:1693
+#: toplevel.cpp:1688
 msgid "Go Forward"
 msgstr "Mynd Ymlaen"
 
-#: toplevel.cpp:1694
+#: toplevel.cpp:1689
 msgid "Go Up"
 msgstr "Ewch i Fyny"
 
-#: toplevel.cpp:1926
+#: toplevel.cpp:1921
 #, c-format
 msgid "Layout Count: %1"
 msgstr ""
 
-#: toplevel.cpp:1933
+#: toplevel.cpp:1928
 msgid "No profile data file loaded."
 msgstr ""
 
-#: toplevel.cpp:1942
+#: toplevel.cpp:1937
 msgid "Total %1 Cost: %2"
 msgstr ""
 
-#: toplevel.cpp:1954
+#: toplevel.cpp:1949
 msgid "No event type selected"
 msgstr ""
 
-#: toplevel.cpp:2199 toplevel.cpp:2235 toplevel.cpp:2271
+#: toplevel.cpp:2194 toplevel.cpp:2230 toplevel.cpp:2266
 msgid "(No Stack)"
 msgstr ""
 
-#: toplevel.cpp:2205
+#: toplevel.cpp:2200
 msgid "(No next function)"
 msgstr ""
 
-#: toplevel.cpp:2241
+#: toplevel.cpp:2236
 msgid "(No previous function)"
 msgstr ""
 
-#: toplevel.cpp:2276
+#: toplevel.cpp:2271
 msgid "(No Function Up)"
 msgstr ""
 
-#. i18n: file dumpselectionbase.ui line 906
-#: instrview.cpp:125 rc.cpp:264 sourceview.cpp:50
-#, no-c-format
-msgid "#"
-msgstr "#"
-
-#: callview.cpp:45 instrview.cpp:127 sourceview.cpp:52
-msgid "Cost 2"
-msgstr ""
-
-#: instrview.cpp:129
-msgid "Hex"
-msgstr "Hecs"
-
-#: instrview.cpp:131 tabview.cpp:313
-msgid "Assembler"
-msgstr ""
-
-#: instrview.cpp:132
-msgid "Source Position"
-msgstr ""
-
-#: instrview.cpp:163
-msgid ""
-"<b>Annotated Assembler</b>"
-"<p>The annotated assembler list shows the machine code instructions of the "
-"current selected function together with (self) cost spent while executing an "
-"instruction. If this is a call instruction, lines with details on the call "
-"happening are inserted into the source: the cost spent inside of the call, the "
-"number of calls happening, and the call destination.</p>"
-"<p>The disassembler output shown is generated with the 'objdump' utility from "
-"the 'binutils' package.</p>"
-"<p>Select a line with call information to make the destination function of this "
-"call current.</p>"
-msgstr ""
-
-#: callgraphview.cpp:2397 callgraphview.cpp:2401 callgraphview.cpp:2419
-#: callview.cpp:123 callview.cpp:128 coverageview.cpp:166 instrview.cpp:191
-#: sourceview.cpp:116
-msgid "Go to '%1'"
-msgstr "Ewch I '%1'"
-
-#: instrview.cpp:195
-#, c-format
-msgid "Go to Address %1"
-msgstr ""
-
-#: instrview.cpp:207
-msgid "Hex Code"
-msgstr ""
-
-#: instrview.cpp:426
-msgid "There is no instruction info in the profile data file."
-msgstr ""
-
-#: instrview.cpp:428
-msgid "For the Valgrind Calltree Skin, rerun with option"
-msgstr ""
-
-#: instrview.cpp:429
-msgid "      --dump-instr=yes"
-msgstr ""
-
-#: instrview.cpp:430
-msgid "To see (conditional) jumps, additionally specify"
-msgstr ""
-
-#: instrview.cpp:431
-msgid "      --trace-jump=yes"
-msgstr ""
-
-#: instrview.cpp:629
-msgid "There is an error trying to execute the command"
-msgstr ""
-
-#: instrview.cpp:634 instrview.cpp:900
-msgid "Check that you have installed 'objdump'."
-msgstr ""
-
-#: instrview.cpp:636 instrview.cpp:902
-msgid "This utility can be found in the 'binutils' package."
-msgstr ""
-
-#: instrview.cpp:739
-msgid "(No Assembler)"
-msgstr ""
-
-#: instrview.cpp:875
-#, c-format
-msgid ""
-"_n: There is %n cost line without assembler code.\n"
-"There are %n cost lines without assembler code."
-msgstr ""
-
-#: instrview.cpp:877
-msgid "This happens because the code of"
-msgstr ""
-
-#: instrview.cpp:880
-msgid "does not seem to match the profile data file."
-msgstr ""
-
-#: instrview.cpp:883
-msgid "Are you using an old profile data file or is the above mentioned"
-msgstr ""
-
-#: instrview.cpp:885
-msgid "ELF object from an updated installation/another machine?"
-msgstr ""
-
-#: instrview.cpp:893
-msgid "There seems to be an error trying to execute the command"
-msgstr ""
-
-#: instrview.cpp:898
-msgid "Check that the ELF object used in the command exists."
-msgstr ""
-
-#: callgraphview.cpp:306
-#, c-format
-msgid "Call(s) from %1"
-msgstr ""
-
-#: callgraphview.cpp:307
+#: costlistitem.cpp:60
 #, c-format
-msgid "Call(s) to %1"
-msgstr ""
-
-#: callgraphview.cpp:308
-msgid "(unknown call)"
-msgstr ""
-
-#: callgraphview.cpp:1425
-msgid ""
-"<b>Call Graph around active Function</b>"
-"<p>Depending on configuration, this view shows the call graph environment of "
-"the active function. Note: the shown cost is <b>only</b> "
-"the cost which is spent while the active function was actually running; i.e. "
-"the cost shown for main() - if it's visible - should be the same as the cost of "
-"the active function, as that's the part of inclusive cost of main() spent while "
-"the active function was running.</p>"
-"<p>For cycles, blue call arrows indicate that this is an artificial call added "
-"for correct drawing which actually never happened.</p>"
-"<p>If the graph is larger than the widget area, an overview panner is shown in "
-"one edge. There are similar visualization options to the Call Treemap; the "
-"selected function is highlighted."
-"<p>"
-msgstr ""
-
-#: callgraphview.cpp:1789
-msgid ""
-"Warning: a long lasting graph layouting is in progress.\n"
-"Reduce node/edge limits for speedup.\n"
-msgstr ""
-
-#: callgraphview.cpp:1792
-msgid ""
-"Layouting stopped.\n"
-msgstr ""
-
-#: callgraphview.cpp:1794
 msgid ""
-"The call graph has %1 nodes and %2 edges.\n"
+"_n: (%n item skipped)\n"
+"(%n items skipped)"
 msgstr ""
 
-#: callgraphview.cpp:1827
-msgid "No item activated for which to draw the call graph."
+#: sourceitem.cpp:125
+msgid "Jump %1 of %2 times to %3"
 msgstr ""
 
-#: callgraphview.cpp:1838
-msgid "No call graph can be drawn for the active item."
+#: sourceitem.cpp:130
+msgid "Jump %1 times to %2"
 msgstr ""
 
-#: callgraphview.cpp:1867
-msgid ""
-"No call graph is available because the following\n"
-"command cannot be run:\n"
-"'%1'\n"
+#: costtypeview.cpp:42
+msgid "Event Type"
 msgstr ""
 
-#: callgraphview.cpp:1870 callgraphview.cpp:2200
-msgid "Please check that 'dot' is installed (package GraphViz)."
-msgstr ""
+#: costtypeview.cpp:45
+msgid "Short"
+msgstr "Byr"
 
-#: callgraphview.cpp:2199
-msgid ""
-"Error running the graph layouting tool.\n"
-msgstr ""
+#: costtypeview.cpp:47
+msgid "Formula"
+msgstr "Fformiwla"
 
-#: callgraphview.cpp:2207
+#: costtypeview.cpp:81
 msgid ""
-"There is no call graph available for function\n"
-"\t'%1'\n"
-"because it has no cost of the selected event type."
-msgstr ""
-
-#: callgraphview.cpp:2428
-msgid "Stop Layouting"
-msgstr ""
-
-#: callgraphview.cpp:2436
-msgid "As PostScript"
-msgstr ""
-
-#: callgraphview.cpp:2437
-msgid "As Image ..."
-msgstr ""
-
-#: callgraphview.cpp:2439
-msgid "Export Graph"
-msgstr ""
-
-#: callgraphview.cpp:2444 callgraphview.cpp:2467
-msgid "Unlimited"
-msgstr "Heb derfyn"
-
-#: callgraphview.cpp:2447 callgraphview.cpp:2470
-msgid "None"
-msgstr "Dim"
-
-#: callgraphview.cpp:2448 callgraphview.cpp:2471
-msgid "max. 2"
-msgstr ""
-
-#: callgraphview.cpp:2449 callgraphview.cpp:2472
-msgid "max. 5"
-msgstr ""
-
-#: callgraphview.cpp:2450 callgraphview.cpp:2473
-msgid "max. 10"
-msgstr ""
-
-#: callgraphview.cpp:2451 callgraphview.cpp:2474
-msgid "max. 15"
-msgstr ""
-
-#: callgraphview.cpp:2461 callgraphview.cpp:2484
-#, c-format
-msgid "< %1"
-msgstr "< %1"
-
-#: callgraphview.cpp:2490
-msgid "No Minimum"
-msgstr ""
-
-#: callgraphview.cpp:2494
-#, c-format
-msgid "50 %"
-msgstr "50 %"
-
-#: callgraphview.cpp:2495
-#, c-format
-msgid "20 %"
-msgstr ""
-
-#: callgraphview.cpp:2496
-#, c-format
-msgid "10 %"
-msgstr ""
-
-#: callgraphview.cpp:2497
-#, c-format
-msgid "5 %"
+"<b>Cost Types List</b>"
+"<p>This list shows all cost types available and what the self/inclusive cost of "
+"the current selected function is for that cost type.</p>"
+"<p>By choosing a cost type from the list, you change the cost type of costs "
+"shown all over KCachegrind to be the selected one.</p>"
 msgstr ""
 
-#: callgraphview.cpp:2498
-#, c-format
-msgid "3 %"
+#: costtypeview.cpp:98
+msgid "Set Secondary Event Type"
 msgstr ""
 
-#: callgraphview.cpp:2499
-#, c-format
-msgid "2 %"
+#: costtypeview.cpp:100
+msgid "Remove Secondary Event Type"
 msgstr ""
 
-#: callgraphview.cpp:2500
-#, c-format
-msgid "1.5 %"
+#: costtypeview.cpp:105
+msgid "Edit Long Name"
 msgstr ""
 
-#: callgraphview.cpp:2501
-#, c-format
-msgid "1 %"
+#: costtypeview.cpp:106
+msgid "Edit Short Name"
 msgstr ""
 
-#: callgraphview.cpp:2517
-msgid "Same as Node"
+#: costtypeview.cpp:107
+msgid "Edit Formula"
 msgstr ""
 
-#: callgraphview.cpp:2518
-#, c-format
-msgid "50 % of Node"
+#: costtypeview.cpp:115
+msgid "New Cost Type ..."
 msgstr ""
 
-#: callgraphview.cpp:2519
+#: costtypeview.cpp:149 costtypeview.cpp:154
 #, c-format
-msgid "20 % of Node"
+msgid "New%1"
 msgstr ""
 
-#: callgraphview.cpp:2520
+#: costtypeview.cpp:155
 #, c-format
-msgid "10 % of Node"
-msgstr ""
-
-#: callgraphview.cpp:2530
-msgid "Caller Depth"
-msgstr ""
-
-#: callgraphview.cpp:2531
-msgid "Callee Depth"
-msgstr ""
-
-#: callgraphview.cpp:2532
-msgid "Min. Node Cost"
-msgstr ""
-
-#: callgraphview.cpp:2533
-msgid "Min. Call Cost"
-msgstr ""
-
-#: callgraphview.cpp:2535
-msgid "Arrows for Skipped Calls"
-msgstr ""
-
-#: callgraphview.cpp:2537
-msgid "Inner-cycle Calls"
-msgstr ""
-
-#: callgraphview.cpp:2539
-msgid "Cluster Groups"
-msgstr ""
-
-#: callgraphview.cpp:2544
-msgid "Compact"
-msgstr "Cywasgu"
-
-#: callgraphview.cpp:2545
-msgid "Normal"
-msgstr "Arferol"
-
-#: callgraphview.cpp:2546
-msgid "Tall"
-msgstr ""
-
-#: callgraphview.cpp:2551
-msgid "Top to Down"
-msgstr ""
-
-#: callgraphview.cpp:2552
-msgid "Left to Right"
-msgstr ""
-
-#: callgraphview.cpp:2553
-msgid "Circular"
-msgstr "Crwn"
-
-#: callgraphview.cpp:2559
-msgid "TopLeft"
-msgstr ""
-
-#: callgraphview.cpp:2560
-msgid "TopRight"
-msgstr ""
-
-#: callgraphview.cpp:2561
-msgid "BottomLeft"
+msgid "New Cost Type %1"
 msgstr ""
 
-#: callgraphview.cpp:2562
-msgid "BottomRight"
-msgstr ""
+#: costtypeitem.cpp:56
+msgid "Unknown Type"
+msgstr "Math anhysbys"
 
-#. i18n: file configdlgbase.ui line 246
-#: callgraphview.cpp:2563 rc.cpp:42 rc.cpp:51 rc.cpp:54
+#. i18n: file dumpselectionbase.ui line 906
+#: instrview.cpp:125 rc.cpp:264 sourceview.cpp:50
 #, no-c-format
-msgid "Automatic"
-msgstr "Awtomatig"
-
-#: callgraphview.cpp:2570
-msgid "Graph"
-msgstr "Graff"
-
-#: callgraphview.cpp:2572
-msgid "Birds-eye View"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: coverageitem.cpp:65 coverageitem.cpp:205 functionitem.cpp:72
-#, c-format
-msgid ""
-"_n: (%n function skipped)\n"
-"(%n functions skipped)"
-msgstr ""
-
-#: main.cpp:38
-msgid "Run <exec> under cachegrind"
-msgstr ""
-
-#: main.cpp:39
-msgid "Show information of this trace"
-msgstr ""
-
-#: main.cpp:46
-msgid "KCachegrind"
-msgstr "KCachegrind"
-
-#: main.cpp:48
-msgid "TDE Frontend for Cachegrind"
-msgstr ""
-
-#: main.cpp:50
-msgid "(C) 2002, 2003, 2004"
-msgstr ""
-
-#: main.cpp:53
-msgid "Author/Maintainer"
-msgstr ""
-
-#: tabview.cpp:64
-msgid "Move to Top"
-msgstr ""
-
-#: tabview.cpp:68
-msgid "Move to Right"
-msgstr ""
-
-#: tabview.cpp:72
-msgid "Move to Bottom"
-msgstr ""
-
-#: tabview.cpp:76
-msgid "Move to Bottom Left"
-msgstr ""
-
-#: tabview.cpp:77 tabview.cpp:94 treemap.cpp:2908
-msgid "Bottom Left"
-msgstr "Chwith Gwaelod"
-
-#: tabview.cpp:79
-msgid "Move Area To"
-msgstr ""
-
-#: tabview.cpp:81
-msgid "Hide This Tab"
-msgstr ""
-
-#: tabview.cpp:82
-msgid "Hide Area"
-msgstr ""
-
-#: tabview.cpp:95
-msgid "Show Hidden On"
-msgstr ""
-
-#: tabview.cpp:242
-msgid "(No profile data file loaded)"
-msgstr ""
-
-#: tabview.cpp:281
-msgid "Types"
-msgstr "Mathau"
-
-#: tabview.cpp:284
-msgid "Callers"
-msgstr ""
-
-#: tabview.cpp:287
-msgid "All Callers"
-msgstr ""
-
-#: tabview.cpp:290
-msgid "Caller Map"
-msgstr ""
-
-#: tabview.cpp:293
-msgid "Source"
-msgstr "Tarddiad"
-
-#: tabview.cpp:297
-msgid "Parts"
-msgstr "Rhannau"
-
-#: tabview.cpp:300
-msgid "Call Graph"
-msgstr ""
-
-#: tabview.cpp:303
-msgid "Callees"
-msgstr ""
-
-#: tabview.cpp:306
-msgid "All Callees"
-msgstr ""
-
-#: tabview.cpp:310
-msgid "Callee Map"
-msgstr ""
-
-#: tabview.cpp:553
-msgid ""
-"<b>Information Tabs</b>"
-"<p>This widget shows information for the current selected function in different "
-"tabs: "
-"<ul>"
-"<li>The Costs tab shows a list of available event types and the inclusive and "
-"self costs regarding to these types.</li>"
-"<li>The Parts tab shows a list of trace parts if the trace consists of more "
-"than one part (otherwise, this tab is hided). The cost of the selected function "
-"spent in the different parts together with the calls happening is shown.</li>"
-"<li>The Call Lists tab shows direct callers and callees of the function in more "
-"detail.</li>"
-"<li>The Coverage tab shows the same is the Call Lists tab, but not only direct "
-"callers and callees but also indirect ones.</li>"
-"<li>The Call Graph tab shows a graphical visualization of the calls done by "
-"this function.</li>"
-"<li>The Source tab presents annotated source code if debugging information and "
-"the source file is available.</li>"
-"<li>The Assembler tab presents annotated assembler code if trace information on "
-"instruction level is available.</li></ul>For more information, see the <em>"
-"What's This?</em> help of the corresponding tab widget</p>"
-msgstr ""
-
-#: tabview.cpp:630
-msgid "(No Data loaded)"
-msgstr ""
-
-#: tabview.cpp:631
-msgid "(No function selected)"
-msgstr ""
+msgid "#"
+msgstr "#"
 
 #: sourceview.cpp:54 sourceview.cpp:554
 msgid "Source (unknown)"
@@ -1416,18 +1466,6 @@ msgstr ""
 msgid "The list can be found in the configuration dialog."
 msgstr ""
 
-#: partlistitem.cpp:49
-msgid " (Thread %1)"
-msgstr ""
-
-#: partlistitem.cpp:56
-msgid "(none)"
-msgstr "(dim)"
-
-#: callitem.cpp:82 partlistitem.cpp:152
-msgid "(active)"
-msgstr "(gweithredol)"
-
 #: functionselection.cpp:176
 #, c-format
 msgid "Go to %1"
@@ -1441,130 +1479,6 @@ msgstr ""
 msgid "No Grouping"
 msgstr ""
 
-#: coverageview.cpp:48 coverageview.cpp:54
-msgid "Distance"
-msgstr "Pellder"
-
-#. i18n: file dumpselectionbase.ui line 928
-#: coverageview.cpp:49 partview.cpp:49 rc.cpp:270 rc.cpp:315
-#, no-c-format
-msgid "Called"
-msgstr ""
-
-#: callview.cpp:48 coverageview.cpp:50
-msgid "Caller"
-msgstr ""
-
-#: coverageview.cpp:55
-msgid "Calling"
-msgstr ""
-
-#: callview.cpp:52 coverageview.cpp:56
-msgid "Callee"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: configuration.cpp:63
-msgid "Instruction Fetch"
-msgstr ""
-
-#: configuration.cpp:64
-msgid "Data Read Access"
-msgstr ""
-
-#: configuration.cpp:65
-msgid "Data Write Access"
-msgstr ""
-
-#: configuration.cpp:66
-msgid "L1 Instr. Fetch Miss"
-msgstr ""
-
-#: configuration.cpp:67
-msgid "L1 Data Read Miss"
-msgstr ""
-
-#: configuration.cpp:68
-msgid "L1 Data Write Miss"
-msgstr ""
-
-#: configuration.cpp:69
-msgid "L2 Instr. Fetch Miss"
-msgstr ""
-
-#: configuration.cpp:70
-msgid "L2 Data Read Miss"
-msgstr ""
-
-#: configuration.cpp:71
-msgid "L2 Data Write Miss"
-msgstr ""
-
-#: configuration.cpp:72
-msgid "Samples"
-msgstr ""
-
-#: configuration.cpp:73
-msgid "System Time"
-msgstr ""
-
-#: configuration.cpp:74
-msgid "User Time"
-msgstr ""
-
-#: configuration.cpp:75
-msgid "L1 Miss Sum"
-msgstr ""
-
-#: configuration.cpp:76
-msgid "L2 Miss Sum"
-msgstr ""
-
-#: configuration.cpp:77
-msgid "Cycle Estimation"
-msgstr ""
-
 #. i18n: file tdecachegrindui.rc line 15
 #: rc.cpp:9
 #, no-c-format
@@ -1619,6 +1533,12 @@ msgstr ""
 msgid "Cost Item Colors"
 msgstr ""
 
+#. i18n: file configdlgbase.ui line 246
+#: callgraphview.cpp:2562 rc.cpp:42 rc.cpp:51 rc.cpp:54
+#, no-c-format
+msgid "Automatic"
+msgstr "Awtomatig"
+
 #. i18n: file configdlgbase.ui line 254
 #: rc.cpp:45
 #, no-c-format
@@ -1931,12 +1851,6 @@ msgstr ""
 msgid "Basic Blocks"
 msgstr ""
 
-#. i18n: file dumpselectionbase.ui line 754
-#: callmapview.cpp:63 rc.cpp:234 rc.cpp:339
-#, no-c-format
-msgid "Calls"
-msgstr ""
-
 #. i18n: file dumpselectionbase.ui line 796
 #: rc.cpp:243
 #, no-c-format
@@ -1949,12 +1863,6 @@ msgstr ""
 msgid "Distinct"
 msgstr "Gwahanadwy"
 
-#. i18n: file dumpselectionbase.ui line 824
-#: configdlg.cpp:58 rc.cpp:249
-#, no-c-format
-msgid "ELF Objects"
-msgstr ""
-
 #. i18n: file dumpselectionbase.ui line 838
 #: rc.cpp:252
 #, no-c-format
@@ -1979,12 +1887,6 @@ msgstr ""
 msgid "Sync."
 msgstr "Cydweddu."
 
-#. i18n: file dumpselectionbase.ui line 950
-#: callmapview.cpp:61 rc.cpp:276 rc.cpp:321
-#, no-c-format
-msgid "Location"
-msgstr "Lleoliad"
-
 #. i18n: file dumpselectionbase.ui line 976
 #: rc.cpp:279
 #, no-c-format
@@ -2045,528 +1947,644 @@ msgstr ""
 msgid "Cost2"
 msgstr ""
 
-#: treemap.cpp:1281
+#: partgraph.cpp:167
 #, c-format
-msgid "Text %1"
-msgstr "Testun %1"
+msgid "Profile Part %1"
+msgstr ""
 
-#: treemap.cpp:2809
-msgid "Recursive Bisection"
-msgstr "Hanneru Ymgylchol"
+#: partgraph.cpp:226
+msgid "(no trace)"
+msgstr ""
 
-#: treemap.cpp:2810
-msgid "Columns"
-msgstr "Colofnau"
+#: partgraph.cpp:229
+msgid "(no part)"
+msgstr ""
 
-#: treemap.cpp:2811
-msgid "Rows"
-msgstr "Rhesi"
+#: configuration.cpp:67
+msgid "Instruction Fetch"
+msgstr ""
 
-#: treemap.cpp:2812
-msgid "Always Best"
-msgstr "Y Gorau Bob Tro"
+#: configuration.cpp:68
+msgid "Data Read Access"
+msgstr ""
 
-#: treemap.cpp:2813
-msgid "Best"
-msgstr "Y Gorau"
+#: configuration.cpp:69
+msgid "Data Write Access"
+msgstr ""
 
-#: treemap.cpp:2814
-msgid "Alternate (V)"
-msgstr "Bob yn Ail (Fertigol)"
+#: configuration.cpp:70
+msgid "L1 Instr. Fetch Miss"
+msgstr ""
 
-#: treemap.cpp:2815
-msgid "Alternate (H)"
-msgstr "Bob yn Ail (Llorweddol)"
+#: configuration.cpp:71
+msgid "L1 Data Read Miss"
+msgstr ""
 
-#: treemap.cpp:2872
-msgid "Nesting"
-msgstr "Ymnythu"
+#: configuration.cpp:72
+msgid "L1 Data Write Miss"
+msgstr ""
 
-#: treemap.cpp:2875
-msgid "Correct Borders Only"
-msgstr "Cywiro Ffiniau'n Unig"
+#: configuration.cpp:73
+msgid "L2 Instr. Fetch Miss"
+msgstr ""
 
-#: treemap.cpp:2877 treemap.cpp:2878 treemap.cpp:2879 treemap.cpp:2880
-#, c-format
-msgid "Width %1"
-msgstr "Lled %1"
+#: configuration.cpp:74
+msgid "L2 Data Read Miss"
+msgstr ""
 
-#: callmapview.cpp:321 treemap.cpp:2889
-msgid "Shading"
-msgstr "Arliwio"
+#: configuration.cpp:75
+msgid "L2 Data Write Miss"
+msgstr ""
 
-#: treemap.cpp:2902
-msgid "Visible"
-msgstr "Gweledol"
+#: configuration.cpp:76
+msgid "LL Instr. Fetch Miss"
+msgstr ""
 
-#: treemap.cpp:2903
-msgid "Take Space From Children"
-msgstr "Tynnu Lle o'i Blant"
+#: configuration.cpp:77
+msgid "LL Data Read Miss"
+msgstr ""
 
-#: treemap.cpp:2905
-msgid "Top Left"
-msgstr "Chwith Uchaf"
+#: configuration.cpp:78
+msgid "LL Data Write Miss"
+msgstr ""
 
-#: treemap.cpp:2906
-msgid "Top Center"
-msgstr "Canol Uchaf"
+#: configuration.cpp:79
+msgid "Samples"
+msgstr ""
 
-#: treemap.cpp:2907
-msgid "Top Right"
-msgstr "De Uchaf"
+#: configuration.cpp:80
+msgid "System Time"
+msgstr ""
 
-#: treemap.cpp:2909
-msgid "Bottom Center"
-msgstr "Canol Gwaelod"
+#: configuration.cpp:81
+msgid "User Time"
+msgstr ""
 
-#: treemap.cpp:2910
-msgid "Bottom Right"
-msgstr "De Gwaelod"
+#: configuration.cpp:82
+msgid "L1 Miss Sum"
+msgstr ""
 
-#: treemap.cpp:2987
-msgid "No %1 Limit"
-msgstr "Dim Cyfyngiad %1 "
+#: configuration.cpp:83
+msgid "L2 Miss Sum"
+msgstr ""
 
-#: callmapview.cpp:243 treemap.cpp:3039
-msgid "No Area Limit"
-msgstr "Dim Cyfyngiad Ardal"
+#: configuration.cpp:84
+msgid "LL Miss Sum"
+msgstr ""
 
-#: callmapview.cpp:258 treemap.cpp:3045
-msgid "Area of '%1' (%2)"
-msgstr "Ardal '%1' (%2)"
+#: configuration.cpp:85
+msgid "Cycle Estimation"
+msgstr ""
 
-#: treemap.cpp:3056 treemap.cpp:3067
-#, c-format
+#: partview.cpp:51
+msgid "Comment"
+msgstr "Sylwad"
+
+#: partview.cpp:73
 msgid ""
-"_n: 1 Pixel\n"
-"%n Pixels"
+"<b>Trace Part List</b>"
+"<p>This list shows all trace parts of the loaded trace. For each part, the "
+"self/inclusive cost of the current selected function, spent in the part, is "
+"shown; percentage costs are always relative to the total cost <em>"
+"of the part</em> (not to the whole trace as in the Trace Part Overview). Also "
+"shown are the calls happening to/from the current function inside of the trace "
+"part.</p>"
+"<p>By choosing one or more trace parts from the list, the costs shown all over "
+"KCachegrind will only be the ones spent in the selected part(s). If no list "
+"selection is shown, in fact all trace parts are selected implicitly.</p>"
+"<p>This is a multi-selection list. You can select ranges by dragging the mouse "
+"or use SHIFT/CTRL modifiers. Selection/Deselection of trace parts can also be "
+"done by using the Trace Part Overview Dockable. This one also supports multiple "
+"selection.</p>"
+"<p>Note that the list is hidden if only one trace part is loaded.</p>"
 msgstr ""
-"1 Picsel\n"
-" %n Picsel"
 
-#: callmapview.cpp:264 treemap.cpp:3071
-msgid "Double Area Limit (to %1)"
-msgstr "Cyfyngiad Ardal Dwbl (i %1)"
+#: partview.cpp:106
+msgid "Select '%1'"
+msgstr "Dewis '%1'"
 
-#: treemap.cpp:3073
-msgid "Halve Area Limit (to %1)"
-msgstr "Haneru Cyfyngiad Ardal (i %1)"
+#: partview.cpp:107
+msgid "Hide '%1'"
+msgstr "Cuddio '%1'"
 
-#: callmapview.cpp:187 treemap.cpp:3101
-msgid "No Depth Limit"
-msgstr "Dim Cyfyngiad Dyfnder"
+#: partview.cpp:111
+msgid "Hide Selected"
+msgstr ""
 
-#: callmapview.cpp:198 treemap.cpp:3107
-msgid "Depth of '%1' (%2)"
-msgstr "Dyfnder o '%1' (%2)"
+#: partview.cpp:112
+msgid "Show All"
+msgstr "Dangos Pob Un"
 
-#: treemap.cpp:3118
+#: traceitemview.cpp:53
+msgid "No description available"
+msgstr "Dim disgrifiad ar gael"
+
+#: coverageitem.cpp:65 coverageitem.cpp:205 functionitem.cpp:72
 #, c-format
-msgid "Depth %1"
-msgstr "Dyfnder %1"
+msgid ""
+"_n: (%n function skipped)\n"
+"(%n functions skipped)"
+msgstr ""
 
-#: treemap.cpp:3122
-msgid "Decrement (to %1)"
-msgstr "Iselhau fesul un (hyd at %1)"
+#: callgraphview.cpp:306
+#, c-format
+msgid "Call(s) from %1"
+msgstr ""
 
-#: treemap.cpp:3124
-msgid "Increment (to %1)"
-msgstr "Cynyddu fesul un (hyd at %1)"
+#: callgraphview.cpp:307
+#, c-format
+msgid "Call(s) to %1"
+msgstr ""
 
-#: callmapview.cpp:98
+#: callgraphview.cpp:308
+msgid "(unknown call)"
+msgstr ""
+
+#: callgraphview.cpp:1425
 msgid ""
-"<b>Caller Map</b>"
-"<p>This graph shows the nested hierarchy of all callers of the current "
-"activated function. Each colored rectangle represents a function; its size "
-"tries to be proportional to the cost spent therein while the active function is "
-"running (however, there are drawing constrains).</p>"
+"<b>Call Graph around active Function</b>"
+"<p>Depending on configuration, this view shows the call graph environment of "
+"the active function. Note: the shown cost is <b>only</b> "
+"the cost which is spent while the active function was actually running; i.e. "
+"the cost shown for main() - if it's visible - should be the same as the cost of "
+"the active function, as that's the part of inclusive cost of main() spent while "
+"the active function was running.</p>"
+"<p>For cycles, blue call arrows indicate that this is an artificial call added "
+"for correct drawing which actually never happened.</p>"
+"<p>If the graph is larger than the widget area, an overview panner is shown in "
+"one edge. There are similar visualization options to the Call Treemap; the "
+"selected function is highlighted."
+"<p>"
 msgstr ""
 
-#: callmapview.cpp:105
+#: callgraphview.cpp:1789
 msgid ""
-"<b>Call Map</b>"
-"<p>This graph shows the nested hierarchy of all callees of the current "
-"activated function. Each colored rectangle represents a function; its size "
-"tries to be proportional to the cost spent therein while the active function is "
-"running (however, there are drawing constrains).</p>"
+"Warning: a long lasting graph layouting is in progress.\n"
+"Reduce node/edge limits for speedup.\n"
 msgstr ""
 
-#: callmapview.cpp:113
+#: callgraphview.cpp:1792
 msgid ""
-"<p>Appearance options can be found in the in the context menu. To get exact "
-"size proportions, choose 'Hide incorrect borders'. As this mode can be <em>"
-"very</em> time consuming, you may want to limit the maximum drawn nesting level "
-"before. 'Best' determinates the split direction for children from the aspect "
-"ratio of the parent. 'Always Best' decides on remaining space for each sibling. "
-"'Ignore Proportions' takes space for function name drawing <em>before</em> "
-"drawing children. Note that size proportions can get <em>heavily</em> wrong.</p>"
-"<p>This is a <em>TreeMap</em> widget. Keyboard navigation is available with the "
-"left/right arrow keys for traversing siblings, and up/down arrow keys to go a "
-"nesting level up/down. <em>Return</em> activates the current item.</p>"
+"Layouting stopped.\n"
 msgstr ""
 
-#: callmapview.cpp:167
-msgid "Go To"
-msgstr "Ewch I"
+#: callgraphview.cpp:1794
+msgid ""
+"The call graph has %1 nodes and %2 edges.\n"
+msgstr ""
 
-#: callmapview.cpp:184
-msgid "Stop at Depth"
-msgstr "Aros wrth Ddyfnder"
+#: callgraphview.cpp:1827
+msgid "No item activated for which to draw the call graph."
+msgstr ""
 
-#: callmapview.cpp:190
-msgid "Depth 10"
+#: callgraphview.cpp:1838
+msgid "No call graph can be drawn for the active item."
 msgstr ""
 
-#: callmapview.cpp:192
-msgid "Depth 15"
+#: callgraphview.cpp:1867
+msgid ""
+"No call graph is available because the following\n"
+"command cannot be run:\n"
+"'%1'\n"
 msgstr ""
 
-#: callmapview.cpp:194
-msgid "Depth 20"
+#: callgraphview.cpp:1870 callgraphview.cpp:2199
+msgid "Please check that 'dot' is installed (package GraphViz)."
 msgstr ""
 
-#: callmapview.cpp:204
-msgid "Decrement Depth (to %1)"
+#: callgraphview.cpp:2198
+msgid ""
+"Error running the graph layouting tool.\n"
 msgstr ""
 
-#: callmapview.cpp:205
-msgid "Increment Depth (to %1)"
+#: callgraphview.cpp:2206
+msgid ""
+"There is no call graph available for function\n"
+"\t'%1'\n"
+"because it has no cost of the selected event type."
 msgstr ""
 
-#: callmapview.cpp:209
-msgid "Stop at Function"
+#: callgraphview.cpp:2427
+msgid "Stop Layouting"
 msgstr ""
 
-#: callmapview.cpp:210
-msgid "No Function Limit"
+#: callgraphview.cpp:2435
+msgid "As PostScript"
 msgstr ""
 
-#: callmapview.cpp:240
-msgid "Stop at Area"
-msgstr "Aros wrth Ardal"
+#: callgraphview.cpp:2436
+msgid "As Image ..."
+msgstr ""
 
-#: callmapview.cpp:246
-msgid "50 Pixels"
+#: callgraphview.cpp:2438
+msgid "Export Graph"
 msgstr ""
 
-#: callmapview.cpp:248
-msgid "100 Pixels"
+#: callgraphview.cpp:2443 callgraphview.cpp:2466
+msgid "Unlimited"
+msgstr "Heb derfyn"
+
+#: callgraphview.cpp:2446 callgraphview.cpp:2469
+msgid "None"
+msgstr "Dim"
+
+#: callgraphview.cpp:2447 callgraphview.cpp:2470
+msgid "max. 2"
 msgstr ""
 
-#: callmapview.cpp:250
-msgid "200 Pixels"
+#: callgraphview.cpp:2448 callgraphview.cpp:2471
+msgid "max. 5"
 msgstr ""
 
-#: callmapview.cpp:252
-msgid "500 Pixels"
+#: callgraphview.cpp:2449 callgraphview.cpp:2472
+msgid "max. 10"
 msgstr ""
 
-#: callmapview.cpp:266
-msgid "Half Area Limit (to %1)"
+#: callgraphview.cpp:2450 callgraphview.cpp:2473
+msgid "max. 15"
 msgstr ""
 
-#: callmapview.cpp:273
-msgid "Visualisation"
+#: callgraphview.cpp:2460 callgraphview.cpp:2483
+#, c-format
+msgid "< %1"
+msgstr "< %1"
+
+#: callgraphview.cpp:2489
+msgid "No Minimum"
 msgstr ""
 
-#: callmapview.cpp:277
-msgid "Split Direction"
+#: callgraphview.cpp:2493
+#, c-format
+msgid "50 %"
+msgstr "50 %"
+
+#: callgraphview.cpp:2494
+#, c-format
+msgid "20 %"
 msgstr ""
 
-#: callmapview.cpp:279
-msgid "Skip Incorrect Borders"
+#: callgraphview.cpp:2495
+#, c-format
+msgid "10 %"
 msgstr ""
 
-#: callmapview.cpp:284
-msgid "Border Width"
-msgstr "Lled Border"
+#: callgraphview.cpp:2496
+#, c-format
+msgid "5 %"
+msgstr ""
 
-#: callmapview.cpp:285
-msgid "Border 0"
+#: callgraphview.cpp:2497
+#, c-format
+msgid "3 %"
 msgstr ""
 
-#: callmapview.cpp:288
-msgid "Border 1"
+#: callgraphview.cpp:2498
+#, c-format
+msgid "2 %"
 msgstr ""
 
-#: callmapview.cpp:290
-msgid "Border 2"
+#: callgraphview.cpp:2499
+#, c-format
+msgid "1.5 %"
 msgstr ""
 
-#: callmapview.cpp:292
-msgid "Border 3"
+#: callgraphview.cpp:2500
+#, c-format
+msgid "1 %"
 msgstr ""
 
-#: callmapview.cpp:297
-msgid "Draw Symbol Names"
+#: callgraphview.cpp:2516
+msgid "Same as Node"
 msgstr ""
 
-#: callmapview.cpp:298
-msgid "Draw Cost"
+#: callgraphview.cpp:2517
+#, c-format
+msgid "50 % of Node"
 msgstr ""
 
-#: callmapview.cpp:299
-msgid "Draw Location"
+#: callgraphview.cpp:2518
+#, c-format
+msgid "20 % of Node"
 msgstr ""
 
-#: callmapview.cpp:300
-msgid "Draw Calls"
+#: callgraphview.cpp:2519
+#, c-format
+msgid "10 % of Node"
 msgstr ""
 
-#: callmapview.cpp:431
-msgid "Call Map: Current is '%1'"
+#: callgraphview.cpp:2529
+msgid "Caller Depth"
 msgstr ""
 
-#: callmapview.cpp:599
-msgid "(no function)"
+#: callgraphview.cpp:2530
+msgid "Callee Depth"
 msgstr ""
 
-#: callmapview.cpp:741 callmapview.cpp:858
-msgid "(no call)"
+#: callgraphview.cpp:2531
+msgid "Min. Node Cost"
 msgstr ""
 
-#: cachegrindloader.cpp:141
-msgid "Import filter for Cachegrind/Callgrind generated profile data files"
+#: callgraphview.cpp:2532
+msgid "Min. Call Cost"
 msgstr ""
 
-#: cachegrindloader.cpp:738
-#, c-format
-msgid "Loading %1"
-msgstr "llwytho %1"
+#: callgraphview.cpp:2534
+msgid "Arrows for Skipped Calls"
+msgstr ""
 
-#: callview.cpp:47 callview.cpp:51
-msgid "Count"
-msgstr "Cyfrif"
+#: callgraphview.cpp:2536
+msgid "Inner-cycle Calls"
+msgstr ""
 
-#: callview.cpp:85
-msgid ""
-"<b>List of direct Callers</b>"
-"<p>This list shows all functions calling the current selected one directly, "
-"together with a call count and the cost spent in the current selected function "
-"while being called from the function from the list.</p>"
-"<p>An icon instead of an inclusive cost specifies that this is a call inside of "
-"a recursive cycle. An inclusive cost makes no sense here.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
+#: callgraphview.cpp:2538
+msgid "Cluster Groups"
 msgstr ""
 
-#: callview.cpp:98
-msgid ""
-"<b>List of direct Callees</b>"
-"<p>This list shows all functions called by the current selected one directly, "
-"together with a call count and the cost spent in this function while being "
-"called from the selected function.</p>"
-"<p>Selecting a function makes it the current selected one of this information "
-"panel. If there are two panels (Split mode), the function of the other panel is "
-"changed instead.</p>"
+#: callgraphview.cpp:2543
+msgid "Compact"
+msgstr "Cywasgu"
+
+#: callgraphview.cpp:2544
+msgid "Normal"
+msgstr "Arferol"
+
+#: callgraphview.cpp:2545
+msgid "Tall"
 msgstr ""
 
-#: costtypeitem.cpp:56
-msgid "Unknown Type"
-msgstr "Math anhysbys"
+#: callgraphview.cpp:2550
+msgid "Top to Down"
+msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that the <em>What's This?</em> help for every GUI widget\n"
-"in KCachegrind contains detailed usage information for this widget?\n"
-"It is highly recommended to read at least these help texts on first\n"
-"use. Request <em>What's This?</em> help by pressing\n"
-"Shift+F1 and clicking on the widget.</p>\n"
+#: callgraphview.cpp:2551
+msgid "Left to Right"
 msgstr ""
 
-#: tips.cpp:12
-msgid ""
-"<p>...that you can get profile information at instruction level\n"
-"with Calltree when you provide the option <em>--dump-instr=yes</em>?\n"
-"Use the Assembler View for the instruction annotations.\n"
-"</p>\n"
+#: callgraphview.cpp:2552
+msgid "Circular"
+msgstr "Crwn"
+
+#: callgraphview.cpp:2558
+msgid "TopLeft"
 msgstr ""
 
-#: tips.cpp:20
-msgid ""
-"<p>...that you can use Alt-Left/Right keys of your keyboard to go\n"
-"back/forward in the active object history ?</p>\n"
+#: callgraphview.cpp:2559
+msgid "TopRight"
 msgstr ""
 
-#: tips.cpp:26
-msgid ""
-"<p>...that you can navigate in the Callee/Caller Map View using\n"
-"arrow keys? Use Left/Right to change to siblings of the current\n"
-"item; use Up/Down to go one nesting level up/down. To select\n"
-"the current item, press Space, and to activate it, press Return.\n"
-"</p>\n"
+#: callgraphview.cpp:2560
+msgid "BottomLeft"
 msgstr ""
 
-#: tips.cpp:35
-msgid ""
-"<p>...that you can navigate in the Call Graph View using\n"
-"arrow keys? Use Up/Down to go one calling level up/down, alternating\n"
-"between calls and functions. Use Left/Right to change to siblings of a current\n"
-"selected call. To activate the current item, press Return.\n"
-"</p>\n"
+#: callgraphview.cpp:2561
+msgid "BottomRight"
 msgstr ""
 
-#: tips.cpp:44
-msgid ""
-"<p>...that you can rapidly locate a function by entering part of its\n"
-"name (case-insensitive) into the edit line of the toolbar\n"
-"and hit return?</p>\n"
+#: callgraphview.cpp:2569
+msgid "Graph"
+msgstr "Graff"
+
+#: callgraphview.cpp:2571
+msgid "Birds-eye View"
 msgstr ""
 
-#: tips.cpp:51
+#: treemap.cpp:1281
+#, c-format
+msgid "Text %1"
+msgstr "Testun %1"
+
+#: treemap.cpp:2809
+msgid "Recursive Bisection"
+msgstr "Hanneru Ymgylchol"
+
+#: treemap.cpp:2810
+msgid "Columns"
+msgstr "Colofnau"
+
+#: treemap.cpp:2811
+msgid "Rows"
+msgstr "Rhesi"
+
+#: treemap.cpp:2812
+msgid "Always Best"
+msgstr "Y Gorau Bob Tro"
+
+#: treemap.cpp:2813
+msgid "Best"
+msgstr "Y Gorau"
+
+#: treemap.cpp:2814
+msgid "Alternate (V)"
+msgstr "Bob yn Ail (Fertigol)"
+
+#: treemap.cpp:2815
+msgid "Alternate (H)"
+msgstr "Bob yn Ail (Llorweddol)"
+
+#: treemap.cpp:2872
+msgid "Nesting"
+msgstr "Ymnythu"
+
+#: treemap.cpp:2875
+msgid "Correct Borders Only"
+msgstr "Cywiro Ffiniau'n Unig"
+
+#: treemap.cpp:2877 treemap.cpp:2878 treemap.cpp:2879 treemap.cpp:2880
+#, c-format
+msgid "Width %1"
+msgstr "Lled %1"
+
+#: treemap.cpp:2902
+msgid "Visible"
+msgstr "Gweledol"
+
+#: treemap.cpp:2903
+msgid "Take Space From Children"
+msgstr "Tynnu Lle o'i Blant"
+
+#: treemap.cpp:2905
+msgid "Top Left"
+msgstr "Chwith Uchaf"
+
+#: treemap.cpp:2906
+msgid "Top Center"
+msgstr "Canol Uchaf"
+
+#: treemap.cpp:2907
+msgid "Top Right"
+msgstr "De Uchaf"
+
+#: treemap.cpp:2909
+msgid "Bottom Center"
+msgstr "Canol Gwaelod"
+
+#: treemap.cpp:2910
+msgid "Bottom Right"
+msgstr "De Gwaelod"
+
+#: treemap.cpp:2987
+msgid "No %1 Limit"
+msgstr "Dim Cyfyngiad %1 "
+
+#: treemap.cpp:3056 treemap.cpp:3067
+#, c-format
 msgid ""
-"<p>...that you can assign custom colors to \n"
-"ELF objects/C++ Classes/Source Files for graph coloring\n"
-"in <em>Settings->Configure KCachegrind...</em>?</p>\n"
+"_n: 1 Pixel\n"
+"%n Pixels"
 msgstr ""
+"1 Picsel\n"
+" %n Picsel"
 
-#: tips.cpp:58
-msgid ""
-"<p>...that you can see if debug info is available for a selected \n"
-"function by looking at the location label in the Info tab or\n"
-"the source listing header in the source tab?</p>\n"
-"<p>There must be the name of the source file (with extension).\n"
-"If KCachegrind still doesn't show the source, make sure that you\n"
-"have added the directory of the source file to the\n"
-"<em>Source Directories</em> list in the configuration.\n"
+#: treemap.cpp:3073
+msgid "Halve Area Limit (to %1)"
+msgstr "Haneru Cyfyngiad Ardal (i %1)"
+
+#: treemap.cpp:3118
+#, c-format
+msgid "Depth %1"
+msgstr "Dyfnder %1"
+
+#: treemap.cpp:3122
+msgid "Decrement (to %1)"
+msgstr "Iselhau fesul un (hyd at %1)"
+
+#: treemap.cpp:3124
+msgid "Increment (to %1)"
+msgstr "Cynyddu fesul un (hyd at %1)"
+
+#: callitem.cpp:82 partlistitem.cpp:152
+msgid "(active)"
+msgstr "(gweithredol)"
+
+#: instrview.cpp:129
+msgid "Hex"
+msgstr "Hecs"
+
+#: instrview.cpp:132
+msgid "Source Position"
 msgstr ""
 
-#: tips.cpp:69
+#: instrview.cpp:163
 msgid ""
-"<p>...that you can configure whether KCachgrind should\n"
-"show absolute event counts or relative ones (percentage display)?</p>\n"
+"<b>Annotated Assembler</b>"
+"<p>The annotated assembler list shows the machine code instructions of the "
+"current selected function together with (self) cost spent while executing an "
+"instruction. If this is a call instruction, lines with details on the call "
+"happening are inserted into the source: the cost spent inside of the call, the "
+"number of calls happening, and the call destination.</p>"
+"<p>The disassembler output shown is generated with the 'objdump' utility from "
+"the 'binutils' package.</p>"
+"<p>Select a line with call information to make the destination function of this "
+"call current.</p>"
 msgstr ""
 
-#: tips.cpp:75
-msgid ""
-"<p>...that you can configure the maximum number of items\n"
-"for all function lists in KCachegrind? Limiting the number\n"
-"of items is done to get a fast reacting GUI. The last item in\n"
-"the list will show you the number of skipped functions, together\n"
-"with a cost condition for these skipped functions.</p>\n"
-"<p>To activate a function with small costs, search for it and select\n"
-"it in the flat profile. Selecting functions with small cost will\n"
-"temporarily add them to the flat profile list.</p>\n"
+#: instrview.cpp:195
+#, c-format
+msgid "Go to Address %1"
 msgstr ""
 
-#: tips.cpp:87
-msgid ""
-"<p>...that the Coverage tab - in contrast to the Call Lists tab -\n"
-"shows <em>all</em> functions that are calling the selected function\n"
-"(upper part) / are called by the selected function (bottom part),\n"
-"no matter how many function are between them on the stack?</p>\n"
-"<p>Examples:</p>\n"
-"<p>An entry in the upper list for function foo1() with a value of 50%\n"
-"with function bar() selected means that 50% of all the cost of function\n"
-"bar() happened while called from function foo1().</p>\n"
-"<p>An entry in the bottom list for function foo2() with a value of 50%\n"
-"with function bar() selected means that 50% of all the cost of function\n"
-"bar() happened while calling foo2() from bar().</p>\n"
+#: instrview.cpp:207
+msgid "Hex Code"
 msgstr ""
 
-#: tips.cpp:102
-msgid ""
-"<p>...that waiting for the tool tip inside of a tree map\n"
-"shows the list of names of the nested rectangles the mouse\n"
-"pointer is over?</p>\n"
-"<p>Items from this list can be selected by pressing the right\n"
-"mouse button.</p>\n"
+#: instrview.cpp:426
+msgid "There is no instruction info in the profile data file."
 msgstr ""
 
-#: tips.cpp:111
-msgid ""
-"<p>...that you can constrain the cost counts shown to only a\n"
-"few parts of the whole trace by selecting these parts in the\n"
-"\"Trace Selection\" Dockable?</p>\n"
-"<p>To generate multiple parts in a profiling run with\n"
-"cachegrind, use e.g. option --cachedumps=xxx for parts\n"
-"of a length of xxx basic blocks (A basic block is a run\n"
-"of not-branching assembler statements inside of your program\n"
-"code).</p>\n"
+#: instrview.cpp:428
+msgid "For the Valgrind Calltree Skin, rerun with option"
 msgstr ""
 
-#: configdlg.cpp:60
-msgid "Source Files"
+#: instrview.cpp:429
+msgid "      --dump-instr=yes"
 msgstr ""
 
-#: configdlg.cpp:61
-msgid "C++ Classes"
+#: instrview.cpp:430
+msgid "To see (conditional) jumps, additionally specify"
 msgstr ""
 
-#: configdlg.cpp:62
-msgid "Function (no Grouping)"
+#: instrview.cpp:431
+msgid "      --trace-jump=yes"
 msgstr ""
 
-#: configdlg.cpp:157 configdlg.cpp:350 configdlg.cpp:371
-msgid "(always)"
+#: instrview.cpp:629
+msgid "There is an error trying to execute the command"
 msgstr ""
 
-#: configdlg.cpp:210
-msgid "KCachegrind Configuration"
+#: instrview.cpp:634 instrview.cpp:900
+msgid "Check that you have installed 'objdump'."
 msgstr ""
 
-#: configdlg.cpp:211
-msgid ""
-"The Maximum Number of List Items should be below 500.The previous set value "
-"(%1) will still be used."
+#: instrview.cpp:636 instrview.cpp:902
+msgid "This utility can be found in the 'binutils' package."
 msgstr ""
 
-#: configdlg.cpp:384
-msgid "Choose Source Folder"
+#: instrview.cpp:739
+msgid "(No Assembler)"
 msgstr ""
 
-#: partgraph.cpp:167
+#: instrview.cpp:875
 #, c-format
-msgid "Profile Part %1"
+msgid ""
+"_n: There is %n cost line without assembler code.\n"
+"There are %n cost lines without assembler code."
 msgstr ""
 
-#: partgraph.cpp:226
-msgid "(no trace)"
+#: instrview.cpp:877
+msgid "This happens because the code of"
 msgstr ""
 
-#: partgraph.cpp:229
-msgid "(no part)"
+#: instrview.cpp:880
+msgid "does not seem to match the profile data file."
 msgstr ""
 
-#: partview.cpp:51
-msgid "Comment"
-msgstr "Sylwad"
+#: instrview.cpp:883
+msgid "Are you using an old profile data file or is the above mentioned"
+msgstr ""
 
-#: partview.cpp:73
-msgid ""
-"<b>Trace Part List</b>"
-"<p>This list shows all trace parts of the loaded trace. For each part, the "
-"self/inclusive cost of the current selected function, spent in the part, is "
-"shown; percentage costs are always relative to the total cost <em>"
-"of the part</em> (not to the whole trace as in the Trace Part Overview). Also "
-"shown are the calls happening to/from the current function inside of the trace "
-"part.</p>"
-"<p>By choosing one or more trace parts from the list, the costs shown all over "
-"KCachegrind will only be the ones spent in the selected part(s). If no list "
-"selection is shown, in fact all trace parts are selected implicitly.</p>"
-"<p>This is a multi-selection list. You can select ranges by dragging the mouse "
-"or use SHIFT/CTRL modifiers. Selection/Deselection of trace parts can also be "
-"done by using the Trace Part Overview Dockable. This one also supports multiple "
-"selection.</p>"
-"<p>Note that the list is hidden if only one trace part is loaded.</p>"
+#: instrview.cpp:885
+msgid "ELF object from an updated installation/another machine?"
 msgstr ""
 
-#: partview.cpp:106
-msgid "Select '%1'"
-msgstr "Dewis '%1'"
+#: instrview.cpp:893
+msgid "There seems to be an error trying to execute the command"
+msgstr ""
 
-#: partview.cpp:107
-msgid "Hide '%1'"
-msgstr "Cuddio '%1'"
+#: instrview.cpp:898
+msgid "Check that the ELF object used in the command exists."
+msgstr ""
 
-#: partview.cpp:111
-msgid "Hide Selected"
+#: partlistitem.cpp:49
+msgid " (Thread %1)"
 msgstr ""
 
-#: partview.cpp:112
-msgid "Show All"
-msgstr "Dangos Pob Un"
+#: partlistitem.cpp:56
+msgid "(none)"
+msgstr "(dim)"
+
+#: main.cpp:38
+msgid "Run <exec> under cachegrind"
+msgstr ""
+
+#: main.cpp:39
+msgid "Show information of this trace"
+msgstr ""
+
+#: main.cpp:46
+msgid "KCachegrind"
+msgstr "KCachegrind"
+
+#: main.cpp:48
+msgid "TDE Frontend for Cachegrind"
+msgstr ""
+
+#: main.cpp:50
+msgid "(C) 2002, 2003, 2004"
+msgstr ""
+
+#: main.cpp:53
+msgid "Author/Maintainer"
+msgstr ""
 
 #~ msgid "Query Toolbar"
 #~ msgstr "Bar Offer Ymholiadau"
diff --git a/tde-i18n-cy/messages/tdesdk/tdefile_cpp.po b/tde-i18n-cy/messages/tdesdk/tdefile_cpp.po
index 04b88fb0f5f..3ad92400708 100644
--- a/tde-i18n-cy/messages/tdesdk/tdefile_cpp.po
+++ b/tde-i18n-cy/messages/tdesdk/tdefile_cpp.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/tdefile_cpp.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/tdefile_diff.po b/tde-i18n-cy/messages/tdesdk/tdefile_diff.po
index 3ce28323c05..951d0d8f3c0 100644
--- a/tde-i18n-cy/messages/tdesdk/tdefile_diff.po
+++ b/tde-i18n-cy/messages/tdesdk/tdefile_diff.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/tdefile_diff.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/tdefile_po.po b/tde-i18n-cy/messages/tdesdk/tdefile_po.po
index 7e6ef4cc9cb..84b0893fe0f 100644
--- a/tde-i18n-cy/messages/tdesdk/tdefile_po.po
+++ b/tde-i18n-cy/messages/tdesdk/tdefile_po.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/tdefile_po.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/tdefile_ts.po b/tde-i18n-cy/messages/tdesdk/tdefile_ts.po
index a965d1c3fb4..230b7091c1a 100644
--- a/tde-i18n-cy/messages/tdesdk/tdefile_ts.po
+++ b/tde-i18n-cy/messages/tdesdk/tdefile_ts.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/tdefile_ts.po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/tdeio_svn.po b/tde-i18n-cy/messages/tdesdk/tdeio_svn.po
index a2f60d0d4af..49f3fe9a5e7 100644
--- a/tde-i18n-cy/messages/tdesdk/tdeio_svn.po
+++ b/tde-i18n-cy/messages/tdesdk/tdeio_svn.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2006-02-18 03:52+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-cy/messages/tdesdk/umbrello.po b/tde-i18n-cy/messages/tdesdk/umbrello.po
index aed14a5d369..ded4d86e4ee 100644
--- a/tde-i18n-cy/messages/tdesdk/umbrello.po
+++ b/tde-i18n-cy/messages/tdesdk/umbrello.po
@@ -1,14 +1,974 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdesdk/umbrello.po\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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 "Dogfenniaeth"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Alinio Chwith"
+
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Alinio Dde"
+
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Alinio Brig"
+
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Alinio Gwaelod"
+
+#: aligntoolbar.cpp:44
+msgid "AlignQt::Vertical Middle"
+msgstr ""
+
+#: aligntoolbar.cpp:45
+msgid "AlignQt::Horizontal Middle"
+msgstr ""
+
+#: aligntoolbar.cpp:46
+msgid "AlignQt::Vertical Distribute"
+msgstr ""
+
+#: aligntoolbar.cpp:47
+msgid "AlignQt::Horizontal Distribute"
+msgstr ""
+
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. You "
+"can not align associations."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: tips.txt:71
+msgid ""
+"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+
+#: 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 ""
+
+#: tips.txt:86
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: tips.txt:103
+msgid ""
+"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr ""
+
+#: 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 ""
+
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr ""
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
+#: umlviewimageexportermodel.cpp:158
+#, c-format
+msgid "There was a problem saving file: %1"
+msgstr ""
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Gwall Cadw"
+
+#: umllistview.cpp:416
+#, fuzzy
+msgid "Enter Model Name"
+msgstr "Rhowch enw:"
+
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr ""
+
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Golygon"
+
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr ""
+
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr ""
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Use Name"
+msgstr "Enw"
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Enter New Name"
+msgstr "Rhowch enw:"
+
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr ""
+
+#: umllistview.cpp:2338
+#, fuzzy
+msgid "Loading listview..."
+msgstr "Yn cadw ffeil..."
+
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr ""
+
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr ""
+
+#: 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 ""
+
+#: codegenerator.cpp:473
+msgid "Cannot Open File"
+msgstr "Methu Agor y Ffeil"
+
+#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
+msgid ""
+"Cannot create the folder:\n"
+msgstr ""
+
+#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
+msgid ""
+"\n"
+"Please check the access rights"
+msgstr ""
+
+#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+msgid "Cannot Create Folder"
+msgstr ""
+
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr ""
+
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr ""
+
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr ""
+
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr ""
+
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr ""
+
+#: 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 ""
+
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr ""
+
+#: umlview.cpp:2578
+#, fuzzy
+msgid "Enter Diagram Name"
+msgstr "Rhowch enw:"
+
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr ""
+
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr ""
+
+#: operation.cpp:185
+msgid "new_parameter"
+msgstr ""
+
+#: listpopupmenu.cpp:695 stereotype.cpp:76
+msgid "Stereotype"
+msgstr ""
+
+#: 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 "Rhowch enw:"
+
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr ""
+
+#: 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 "Parod."
+
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr ""
+
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr ""
+
+#: codeimport/import_utils.cpp:183
+#, fuzzy
+msgid "Namespace"
+msgstr "Enw"
+
+#. 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 "Dosbarth"
+
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Gwall Mewnol"
+
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr ""
+
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
+
+#: 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 ""
+
+#: uml.cpp:188
+msgid "&Add Default Datatypes for Active Language"
+msgstr ""
+
+#: uml.cpp:193
+msgid "&Code Generation Wizard..."
+msgstr ""
+
+#: uml.cpp:195
+msgid "&Generate All Code"
+msgstr ""
+
+#: uml.cpp:198
+#, fuzzy
+msgid "&Import Classes..."
+msgstr "Dosbarth ..."
+
+#: uml.cpp:201
+msgid "Creates a new document"
+msgstr "Creu dogfen newydd"
+
+#: uml.cpp:202
+msgid "Opens an existing document"
+msgstr "Agor dogfen gyfredol"
+
+#: uml.cpp:203
+msgid "Opens a recently used file"
+msgstr "Agor ffeil a ddefnyddiwyd yn ddiweddar"
+
+#: uml.cpp:204
+msgid "Saves the document"
+msgstr ""
+
+#: uml.cpp:205
+msgid "Saves the document as..."
+msgstr ""
+
+#: uml.cpp:206
+msgid "Closes the document"
+msgstr ""
+
+#: uml.cpp:207
+msgid "Prints out the document"
+msgstr ""
+
+#: uml.cpp:208
+msgid "Quits the application"
+msgstr "Terfynu'r cymhwysiad"
+
+#: 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 "Torri'r adran dewisiedig a'i roi ar y gludfwrdd"
+
+#: uml.cpp:212
+msgid "Copies the selected section to the clipboard"
+msgstr "Copïo'r adran dewisiedig i'r gludfwrdd"
+
+#: uml.cpp:213
+msgid "Pastes the contents of the clipboard"
+msgstr ""
+
+#: uml.cpp:214
+msgid "Set the default program preferences"
+msgstr ""
+
+#: uml.cpp:216
+msgid "Delete &Selected"
+msgstr ""
+
+#: uml.cpp:224
+msgid "&Class Diagram..."
+msgstr ""
+
+#: uml.cpp:228
+msgid "&Autolayout..."
+msgstr ""
+
+#: uml.cpp:231
+msgid "&Sequence Diagram..."
+msgstr ""
+
+#: uml.cpp:234
+msgid "C&ollaboration Diagram..."
+msgstr ""
+
+#: uml.cpp:237
+msgid "&Use Case Diagram..."
+msgstr ""
+
+#: uml.cpp:240
+msgid "S&tate Diagram..."
+msgstr ""
+
+#: uml.cpp:243
+msgid "&Activity Diagram..."
+msgstr ""
+
+#: uml.cpp:246
+msgid "Co&mponent Diagram..."
+msgstr ""
+
+#: uml.cpp:250
+msgid "&Deployment Diagram..."
+msgstr ""
+
+#: uml.cpp:254
+msgid "&Entity Relationship Diagram..."
+msgstr ""
+
+#: uml.cpp:258
+msgid "&Clear Diagram"
+msgstr ""
+
+#: uml.cpp:260
+msgid "&Snap to Grid"
+msgstr "&Snapio i'r Grid"
+
+#: uml.cpp:262
+msgid "S&how Grid"
+msgstr "D&angos Grid"
+
+#: uml.cpp:265
+msgid "&Hide Grid"
+msgstr "&Cuddio Grid"
+
+#: uml.cpp:269
+msgid "&Export as Picture..."
+msgstr ""
+
+#: uml.cpp:271
+msgid "Export &All Diagrams as Pictures..."
+msgstr ""
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Priodweddau"
+
+#: uml.cpp:286
+msgid "&Zoom Slider"
+msgstr ""
+
+#: uml.cpp:289
+#, c-format
+msgid "Z&oom to 100%"
+msgstr "C&hwyddo i 100%"
+
+#: uml.cpp:295
+msgid "&Move Tab Left"
+msgstr "&Symud Tab i'r Chwith"
+
+#: uml.cpp:296
+msgid "&Move Tab Right"
+msgstr "&Symud Tab i'r Dde"
+
+#: uml.cpp:308
+msgid "Select Diagram on Left"
+msgstr ""
+
+#: uml.cpp:309
+msgid "Select Diagram on Right"
+msgstr ""
+
+#: uml.cpp:327
+msgid "&Windows"
+msgstr "&Ffenestri"
+
+#: uml.cpp:347
+#, c-format
+msgid " &33%"
+msgstr ""
+
+#: uml.cpp:348
+#, c-format
+msgid " &50%"
+msgstr ""
+
+#: uml.cpp:349
+#, c-format
+msgid " &75%"
+msgstr ""
+
+#: uml.cpp:350
+#, c-format
+msgid "&100%"
+msgstr "&100%"
+
+#: uml.cpp:351
+#, c-format
+msgid "1&50%"
+msgstr ""
+
+#: 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 ""
+
+#: uml.cpp:398
+msgid "Alignment Toolbar"
+msgstr ""
+
+#: listpopupmenu.cpp:615 uml.cpp:420
+msgid "Class Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:618 uml.cpp:421
+msgid "Sequence Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:619 uml.cpp:422
+msgid "Collaboration Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:551 uml.cpp:423
+msgid "Use Case Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:616 uml.cpp:424
+msgid "State Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:617 uml.cpp:425
+msgid "Activity Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:521 uml.cpp:426
+msgid "Component Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:528 uml.cpp:427
+msgid "Deployment Diagram..."
+msgstr ""
+
+#: listpopupmenu.cpp:541 uml.cpp:428
+msgid "Entity Relationship Diagram..."
+msgstr ""
+
+#: uml.cpp:458
+msgid "&Tree View"
+msgstr "Golwg &Coeden"
+
+#: uml.cpp:467
+msgid "&Documentation"
+msgstr "&Dogfenniaeth"
+
+#: uml.cpp:479 uml.cpp:664 uml.cpp:692
+msgid "Opening file..."
+msgstr "Agor ffeil..."
+
+#: uml.cpp:650
+msgid "Creating new document..."
+msgstr "Yn creu dogfen newydd..."
+
+#: 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 ""
+
+#: uml.cpp:677
+msgid "Open File"
+msgstr "Agor Ffeil"
+
+#: uml.cpp:716
+msgid "Saving file..."
+msgstr "Yn cadw ffeil..."
+
+#: uml.cpp:727
+msgid "Saving file with a new filename..."
+msgstr ""
+
+#: 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 ""
+
+#: uml.cpp:740
+msgid ""
+"The file %1 exists.\n"
+"Do you wish to overwrite it?"
+msgstr ""
+
+#: uml.cpp:740
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: uml.cpp:764
+msgid "Closing file..."
+msgstr "Yn cau ffeil..."
+
+#: uml.cpp:772
+msgid "Printing..."
+msgstr "Argraffu..."
+
+#: uml.cpp:779
+#, c-format
+msgid "Print %1"
+msgstr "Argraffu %1"
+
+#: uml.cpp:787
+msgid "Exiting..."
+msgstr "Terfynu..."
+
+#: uml.cpp:823
+msgid "Cutting selection..."
+msgstr "Yn torri'r dewisiad..."
+
+#: uml.cpp:836
+msgid "Copying selection to clipboard..."
+msgstr "Yn copïo'r dewisiad i'r clipfwrdd..."
+
+#: uml.cpp:844
+msgid "Inserting clipboard contents..."
+msgstr "Yn mewnosod cynnwys y clipfwrdd..."
+
+#: 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 ""
+
+#: clipboard/umlclipboard.cpp:691 uml.cpp:851
+msgid "Paste Error"
+msgstr ""
+
+#: uml.cpp:863
+msgid "Toggling toolbar..."
+msgstr "Dangos/cuddio'r bar offer..."
+
+#: uml.cpp:878
+msgid "Toggle the statusbar..."
+msgstr "Dangos/cuddio'r bar cyflwr..."
+
+#: uml.cpp:1186
+msgid "Cannot view code until you generate some first."
+msgstr ""
+
+#: uml.cpp:1186 uml.cpp:1189
+msgid "Cannot View Code"
+msgstr ""
+
+#: uml.cpp:1189
+msgid "Cannot view code from simple code writer."
+msgstr ""
+
+#: uml.cpp:1387
+msgid "*.idl|IDL Files (*.idl)"
+msgstr ""
+
+#: uml.cpp:1389
+msgid "*.py|Python Files (*.py)"
+msgstr ""
+
+#: uml.cpp:1391
+msgid "*.java|Java Files (*.java)"
+msgstr ""
+
+#: uml.cpp:1393
+msgid "*.pas|Pascal Files (*.pas)"
+msgstr ""
+
+#: uml.cpp:1395
+msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
+msgstr ""
+
+#: uml.cpp:1397
+msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
+msgstr ""
+
+#: uml.cpp:1399
+msgid "All Files"
+msgstr "Pob Ffeil"
+
+#: uml.cpp:1401
+msgid "Select Code to Import"
+msgstr ""
+
+#: 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 "Enw"
+
+#: 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 ""
+
+#: 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 ""
+
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
 #: worktoolbar.cpp:245
 msgid "Object"
 msgstr "Gwrthrych"
@@ -78,14 +1038,6 @@ msgstr ""
 msgid "Use Case"
 msgstr ""
 
-#. 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 "Dosbarth"
-
 #: listpopupmenu.cpp:1030 worktoolbar.cpp:263
 msgid "Initial State"
 msgstr ""
@@ -199,279 +1151,280 @@ msgstr "ANIFFINIEDIG"
 msgid "Select"
 msgstr "Dewis"
 
-#: 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."
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
 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."
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
 msgstr ""
 
-#. 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 "Cyffredinol"
-
-#: 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 "Priodweddau Cyffredinol"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Yn cadw ffeil..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
-#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
-#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
-#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
-#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
-#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
-#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
-#: rc.cpp:207 rc.cpp:445 rc.cpp:492
-#, no-c-format
-msgid "Documentation"
-msgstr "Dogfenniaeth"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr ""
 
-#: 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 "Gosodiadau Ffont"
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Ffeil i agor"
 
-#: 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 "Lliw"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
+#: docgenerators/main.cpp:64
+msgid ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:31
+#: umlviewimageexporter.cpp:46
+#, fuzzy
+msgid "Exporting view..."
+msgstr "Terfynu..."
+
+#: umlviewimageexporter.cpp:50
 msgid ""
-"The file %1 already exists in %2.\n"
-"\n"
-"Umbrello can overwrite the file, generate a similar\n"
-"file name or not generate this file."
+"An error happened when exporting the image:\n"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
 
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Ffeil yn Bodoli'n Barod"
+
 #: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
 msgid "&Overwrite"
 msgstr "&Trosysgrifo"
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
+#: clipboard/umlclipboard.cpp:687
+msgid ""
+"At least one of the items in the clipboard could not be pasted because an item "
+"of the same name already exists.  Any other items have been pasted."
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
 msgstr ""
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
+#: umldoc.cpp:106
+msgid "Logical View"
 msgstr ""
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
+#: umldoc.cpp:107
+msgid "Use Case View"
 msgstr ""
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Ail-enwi"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr ""
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
+#: umldoc.cpp:109
+msgid "Deployment View"
 msgstr ""
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
 msgstr ""
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
 msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
+"Addaswyd y ffeil gyfredol.\n"
+"Hoffech ei chadw?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Nid yw'r ffeil %1 yn bodoli!."
+
+#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
+#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+msgid "Load Error"
+msgstr "Gwall Llwytho"
+
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Creu"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Gorffen"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
+#: umldoc.cpp:934
+msgid "use case diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
+#: umldoc.cpp:936
+msgid "class diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: umldoc.cpp:938
+msgid "sequence diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Creu Plygell"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
+#: umldoc.cpp:944
+msgid "activity diagram"
 msgstr ""
 
-#: 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."
+#: umldoc.cpp:946
+msgid "component diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
+#: umldoc.cpp:948
+msgid "deployment diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:184
-msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
 msgstr ""
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
 msgstr ""
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
 msgstr ""
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Lliw Celfigyn"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr ""
 
-#: 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 "Gosodiadau Cyffredinol"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr ""
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Dangos"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not add "
+"it again."
+msgstr ""
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
 msgstr ""
 
-#: 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"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1918
-#: umllistview.cpp:1925 umllistview.cpp:2162
-msgid "Name Not Unique"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr ""
+
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
 msgstr ""
 
 #: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
@@ -479,96 +1432,91 @@ msgstr ""
 msgid "Attributes"
 msgstr "Priodweddion"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr ""
-
 #: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
 #: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
 msgid "Operations"
 msgstr "Gweithrediadau"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid ""
+"An operation with that signature already exists in %1.\n"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Patrymluniau"
-
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes"
-msgstr "Priodweddion"
-
-#: dialogs/classifierlistpage.cpp:51
-#, fuzzy
-msgid "N&ew Entity Attribute..."
-msgstr "Priodoleddau ..."
-
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Priodweddau"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Dewisiadau masg"
-
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr ""
+#. 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 "Cyffredinol"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr ""
+#: 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 "Gosodiadau Cyffredinol"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents 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 "Gosodiadau Ffont"
+
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
 msgstr ""
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
+#. i18n: file dialogs/codeviewerdialogbase.ui line 21
+#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
+#, no-c-format
+msgid "Code Viewer"
 msgstr ""
 
 #: dialogs/umloperationdialog.cpp:50
 msgid "Operation Properties"
 msgstr ""
 
+#: 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 "Priodweddau Cyffredinol"
+
 #: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
 #: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
 #: dialogs/umltemplatedialog.cpp:61
@@ -658,35 +1606,15 @@ msgstr ""
 msgid "You have entered an invalid operation name."
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr ""
-
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr ""
-
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr ""
-
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr ""
-
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr ""
+#. i18n: file dialogs/diagrampropertiespage.ui line 61
+#: dialogs/assocgenpage.cpp:67 rc.cpp:408
+#, no-c-format
+msgid "Name:"
+msgstr "Enw:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr ""
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Math:"
 
 #: dialogs/parmpropdlg.cpp:35
 msgid "Parameter Properties"
@@ -706,31 +1634,6 @@ msgid ""
 "is a parameter for reading and writing."
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Cyhoeddus"
-
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr ""
-
 #: dialogs/classgenpage.cpp:50
 msgid "Class &name:"
 msgstr ""
@@ -858,284 +1761,6 @@ msgstr ""
 msgid "Name is Not Unique"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Gwerth ragosod :"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Priodweddion :"
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Dim"
-
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Cynradd"
-
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "Mynega&i"
-
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unigryw"
-
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:192
-msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Hidlo"
-
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Dewisiad"
-
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr ""
-
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr ""
-
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr ""
-
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr ""
-
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr ""
-
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr ""
-
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr ""
-
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr ""
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr ""
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr ""
-
-#. 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 "Cyhoeddus"
-
-#. 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 "Preivat"
-
-#. 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 "Gwarchodir"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, fuzzy, no-c-format
-msgid "Implementation"
-msgstr "Dogfenniaeth"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr ""
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr ""
-
-#. 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 ""
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Llinell :"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Llenwi :"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "R&hagosodedig"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:138
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr ""
-
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr ""
-
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr ""
-
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr ""
-
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr ""
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr ""
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr ""
-
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr ""
-
 #: dialogs/settingsdlg.cpp:30
 msgid "Umbrello Setup"
 msgstr ""
@@ -1148,6 +1773,14 @@ msgstr ""
 msgid "User Interface Settings"
 msgstr ""
 
+#: 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 "Lliw"
+
 #: dialogs/settingsdlg.cpp:54
 msgid "Line color:"
 msgstr "Lliw y llinell:"
@@ -1322,6 +1955,30 @@ msgstr ""
 msgid "Default operation scope:"
 msgstr ""
 
+#. 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 "Cyhoeddus"
+
+#. 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 "Preivat"
+
+#. 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 "Gwarchodir"
+
 #: dialogs/settingsdlg.cpp:294
 msgid "Code Generation"
 msgstr ""
@@ -1334,1238 +1991,610 @@ msgstr ""
 msgid "Code Viewer Settings"
 msgstr ""
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr ""
-
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Dangos"
-
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Gweithre&diadau"
-
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr ""
-
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr ""
-
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pec&yn"
-
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Pri&odweddion"
-
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Enw:"
-
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Math:"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Dangos"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr ""
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Dewisiadau masg"
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
-#: umlviewimageexportermodel.cpp:158
-#, c-format
-msgid "There was a problem saving file: %1"
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
-msgstr "Gwall Cadw"
-
-#: umllistview.cpp:416
-#, fuzzy
-msgid "Enter Model Name"
-msgstr "Rhowch enw:"
-
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
 msgstr ""
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Golygon"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Patrymluniau"
 
-#: umllistview.cpp:1907
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
 msgstr ""
 
-#: umllistview.cpp:1908 umllistviewitem.cpp:479
-msgid "Name Not Valid"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#: umldoc.cpp:1067 umllistview.cpp:1917
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
 msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1918
-#, fuzzy
-msgid "Use Name"
-msgstr "Enw"
-
-#: umldoc.cpp:1068 umllistview.cpp:1918
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
 #, fuzzy
-msgid "Enter New Name"
-msgstr "Rhowch enw:"
+msgid "Entity Attributes"
+msgstr "Priodweddion"
 
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
 msgstr ""
 
-#: umllistview.cpp:2119 umllistview.cpp:2136 umllistview.cpp:2151
-msgid "Creation canceled"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
 msgstr ""
 
-#: umllistview.cpp:2339
-#, fuzzy
-msgid "Loading listview..."
-msgstr "Yn cadw ffeil..."
-
-#: umllistview.cpp:2671
-msgid "The folder must be emptied before it can be deleted."
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
 msgstr ""
 
-#: umllistview.cpp:2672
-msgid "Folder Not Empty"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
+#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#, no-c-format
+msgid "Role Properties"
 msgstr ""
 
-#: 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 "Enw"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
 msgstr ""
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Gwerth ragosod :"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 msgstr ""
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
 msgstr ""
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 msgstr ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "GWALL"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Newid y Testun"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Priodweddion :"
 
-#: codegenerator.cpp:473
-msgid ""
-"Cannot open file %1 for writing. Please make sure the folder exists and you "
-"have permissions to write to it."
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 msgstr ""
 
-#: codegenerator.cpp:473
-msgid "Cannot Open File"
-msgstr "Methu Agor y Ffeil"
-
-#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Dim"
 
-#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
-msgid ""
-"\n"
-"Please check the access rights"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Cynradd"
 
-#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
-msgid "Cannot Create Folder"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "Mynega&i"
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Terfynu..."
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unigryw"
 
-#: umlviewimageexporter.cpp:50
-msgid ""
-"An error happened when exporting the image:\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
 msgstr ""
 
-#: 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 "Parod."
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr ""
 
-#: umlviewimageexporter.cpp:66
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
 
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Ffeil yn Bodoli'n Barod"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Alinio Chwith"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Alinio Dde"
-
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Alinio Brig"
-
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Alinio Gwaelod"
-
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
 msgstr ""
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Llinell :"
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Llenwi :"
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "R&hagosodedig"
 
-#: aligntoolbar.cpp:383
-msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
 msgstr ""
 
-#: 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 "Rhowch enw:"
-
-#: 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."
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
 msgstr ""
 
-#: object_factory.cpp:164
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr ""
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr ""
-
-#: 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 ""
-
-#: 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"
+"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 ""
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
 msgstr ""
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
 msgstr ""
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
 msgstr ""
 
-#: model_utils.cpp:244
-msgid "new_actor"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
 msgstr ""
 
-#: model_utils.cpp:246
-msgid "new_usecase"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
 msgstr ""
 
-#: model_utils.cpp:248
-msgid "new_package"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
 msgstr ""
 
-#: model_utils.cpp:250
-msgid "new_component"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
 msgstr ""
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr ""
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Lliw Celfigyn"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
 msgstr ""
 
-#: model_utils.cpp:256
-msgid "new_interface"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
 msgstr ""
 
-#: model_utils.cpp:258
-msgid "new_datatype"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
 msgstr ""
 
-#: model_utils.cpp:260
-msgid "new_enum"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
 msgstr ""
 
-#: model_utils.cpp:262
-msgid "new_entity"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#: model_utils.cpp:264
+#: dialogs/classifierlistpage.cpp:51
 #, fuzzy
-msgid "new_folder"
-msgstr "plygell"
+msgid "N&ew Entity Attribute..."
+msgstr "Priodoleddau ..."
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
 msgstr ""
 
-#: model_utils.cpp:268
-msgid "new_object"
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
 msgstr ""
 
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Gwag"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
 msgstr ""
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
 msgstr ""
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
 msgstr ""
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr ""
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Ail-enwi"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
 msgstr ""
 
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
 msgstr ""
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
 msgstr ""
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
 msgstr ""
 
-#: codeimport/import_utils.cpp:183
-#, fuzzy
-msgid "Namespace"
-msgstr "Enw"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Hidlo"
 
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Dewisiad"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
+#, no-c-format
+msgid "Rolename:"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
+#, no-c-format
+msgid "Multiplicity:"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr ""
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
+#, fuzzy, no-c-format
+msgid "Implementation"
+msgstr "Dogfenniaeth"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
+#, no-c-format
+msgid "Changeable"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
+#, no-c-format
+msgid "Frozen"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
+#, no-c-format
+msgid "Add only"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
 msgstr ""
 
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Gwall Mewnol"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Cyhoeddus"
 
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
 msgstr ""
 
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3
+#: dialogs/umlattributedialog.cpp:163
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: main.cpp:32 main.cpp:93
-msgid "Umbrello UML Modeller"
-msgstr ""
-
-#: main.cpp:40
-msgid "File to open"
-msgstr "Ffeil i agor"
-
-#: main.cpp:41
-msgid "export diagrams to extension and exit"
-msgstr ""
-
-#: main.cpp:42
-msgid "the local directory to save the exported diagrams in"
+"The attribute name you have chosen is already being used in this operation."
 msgstr ""
 
-#: main.cpp:42
-msgid "the directory of the file"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
 msgstr ""
 
-#: main.cpp:43
-msgid ""
-"keep the tree structure used to store the views in the document in the target "
-"directory"
-msgstr ""
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Dangos"
 
-#: main.cpp:95
-msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
-msgstr ""
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Gweithre&diadau"
 
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
 msgstr ""
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
 msgstr ""
 
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Ffeil i agor"
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pec&yn"
 
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Pri&odweddion"
 
-#: docgenerators/main.cpp:64
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "Yn cadw ffeil..."
-
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
 msgstr ""
 
-#: association.cpp:84
-msgid "Generalization"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
 msgstr ""
 
-#: association.cpp:88
-msgid "Self Association"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
 msgstr ""
 
-#: association.cpp:89
-msgid "Collaboration Message"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
 msgstr ""
 
-#: association.cpp:90
-msgid "Sequence Message"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
 msgstr ""
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
 msgstr ""
 
-#: association.cpp:92
-msgid "Sequence Self Message"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
+#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#, no-c-format
+msgid "Code Generation Options"
 msgstr ""
 
-#: association.cpp:95
-msgid "Realization"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Creu"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Gorffen"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
 msgstr ""
 
-#: umldoc.cpp:106
-msgid "Logical View"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
 msgstr ""
 
-#: umldoc.cpp:107
-msgid "Use Case View"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
 msgstr ""
 
-#: umldoc.cpp:108
-msgid "Component View"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
 msgstr ""
 
-#: umldoc.cpp:109
-msgid "Deployment View"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
 msgstr ""
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Creu Plygell"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
 msgstr ""
 
-#: umldoc.cpp:229
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Addaswyd y ffeil gyfredol.\n"
-"Hoffech ei chadw?"
-
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Nid yw'r ffeil %1 yn bodoli!."
-
-#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
-#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
-msgid "Load Error"
-msgstr "Gwall Llwytho"
-
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr ""
-
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr ""
-
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr ""
-
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr ""
-
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr ""
-
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr ""
-
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr ""
-
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr ""
-
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr ""
-
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr ""
-
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr ""
-
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr ""
-
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr ""
-
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr ""
-
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr ""
-
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr ""
-
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr ""
-
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr ""
-
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr ""
-
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr ""
-
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr ""
-
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr ""
-
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr ""
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select another, "
+"valid, folder."
 msgstr ""
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
 msgstr ""
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
 msgstr ""
 
-#: umllistviewitem.cpp:478
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Dewisiadau Cyffredinol"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr ""
-
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr ""
-
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr ""
-
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr ""
-
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr ""
-
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr ""
-
-#: 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 ""
-
-#: uml.cpp:188
-msgid "&Add Default Datatypes for Active Language"
-msgstr ""
-
-#: uml.cpp:193
-msgid "&Code Generation Wizard..."
-msgstr ""
-
-#: uml.cpp:195
-msgid "&Generate All Code"
-msgstr ""
-
-#: uml.cpp:198
-#, fuzzy
-msgid "&Import Classes..."
-msgstr "Dosbarth ..."
-
-#: uml.cpp:201
-msgid "Creates a new document"
-msgstr "Creu dogfen newydd"
-
-#: uml.cpp:202
-msgid "Opens an existing document"
-msgstr "Agor dogfen gyfredol"
-
-#: uml.cpp:203
-msgid "Opens a recently used file"
-msgstr "Agor ffeil a ddefnyddiwyd yn ddiweddar"
-
-#: uml.cpp:204
-msgid "Saves the document"
-msgstr ""
-
-#: uml.cpp:205
-msgid "Saves the document as..."
-msgstr ""
-
-#: uml.cpp:206
-msgid "Closes the document"
-msgstr ""
-
-#: uml.cpp:207
-msgid "Prints out the document"
-msgstr ""
-
-#: uml.cpp:208
-msgid "Quits the application"
-msgstr "Terfynu'r cymhwysiad"
-
-#: 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 "Torri'r adran dewisiedig a'i roi ar y gludfwrdd"
-
-#: uml.cpp:212
-msgid "Copies the selected section to the clipboard"
-msgstr "Copïo'r adran dewisiedig i'r gludfwrdd"
-
-#: uml.cpp:213
-msgid "Pastes the contents of the clipboard"
-msgstr ""
-
-#: uml.cpp:214
-msgid "Set the default program preferences"
-msgstr ""
-
-#: uml.cpp:216
-msgid "Delete &Selected"
-msgstr ""
-
-#: uml.cpp:224
-msgid "&Class Diagram..."
-msgstr ""
-
-#: uml.cpp:228
-msgid "&Autolayout..."
-msgstr ""
-
-#: uml.cpp:231
-msgid "&Sequence Diagram..."
-msgstr ""
-
-#: uml.cpp:234
-msgid "C&ollaboration Diagram..."
-msgstr ""
-
-#: uml.cpp:237
-msgid "&Use Case Diagram..."
-msgstr ""
-
-#: uml.cpp:240
-msgid "S&tate Diagram..."
-msgstr ""
-
-#: uml.cpp:243
-msgid "&Activity Diagram..."
-msgstr ""
-
-#: uml.cpp:246
-msgid "Co&mponent Diagram..."
-msgstr ""
-
-#: uml.cpp:250
-msgid "&Deployment Diagram..."
-msgstr ""
-
-#: uml.cpp:254
-msgid "&Entity Relationship Diagram..."
-msgstr ""
-
-#: uml.cpp:258
-msgid "&Clear Diagram"
-msgstr ""
-
-#: uml.cpp:260
-msgid "&Snap to Grid"
-msgstr "&Snapio i'r Grid"
-
-#: uml.cpp:262
-msgid "S&how Grid"
-msgstr "D&angos Grid"
-
-#: uml.cpp:265
-msgid "&Hide Grid"
-msgstr "&Cuddio Grid"
-
-#: uml.cpp:269
-msgid "&Export as Picture..."
-msgstr ""
-
-#: uml.cpp:271
-msgid "Export &All Diagrams as Pictures..."
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
 
-#: uml.cpp:286
-msgid "&Zoom Slider"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
 msgstr ""
 
-#: uml.cpp:289
-#, c-format
-msgid "Z&oom to 100%"
-msgstr "C&hwyddo i 100%"
-
-#: uml.cpp:295
-msgid "&Move Tab Left"
-msgstr "&Symud Tab i'r Chwith"
-
-#: uml.cpp:296
-msgid "&Move Tab Right"
-msgstr "&Symud Tab i'r Dde"
-
-#: uml.cpp:308
-msgid "Select Diagram on Left"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
 
-#: uml.cpp:309
-msgid "Select Diagram on Right"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
 msgstr ""
 
-#: uml.cpp:327
-msgid "&Windows"
-msgstr "&Ffenestri"
-
-#: uml.cpp:347
-#, c-format
-msgid " &33%"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
 msgstr ""
 
-#: uml.cpp:348
-#, c-format
-msgid " &50%"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
 msgstr ""
 
-#: uml.cpp:349
-#, c-format
-msgid " &75%"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
 msgstr ""
 
-#: uml.cpp:350
-#, c-format
-msgid "&100%"
-msgstr "&100%"
-
-#: uml.cpp:351
-#, c-format
-msgid "1&50%"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
 msgstr ""
 
-#: 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"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
 msgstr ""
 
-#: uml.cpp:398
-msgid "Alignment Toolbar"
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
 msgstr ""
 
-#: listpopupmenu.cpp:615 uml.cpp:420
-msgid "Class Diagram..."
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
 msgstr ""
 
-#: listpopupmenu.cpp:618 uml.cpp:421
-msgid "Sequence Diagram..."
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
 
-#: listpopupmenu.cpp:619 uml.cpp:422
-msgid "Collaboration Diagram..."
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
 msgstr ""
 
-#: listpopupmenu.cpp:551 uml.cpp:423
-msgid "Use Case Diagram..."
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
 msgstr ""
 
-#: listpopupmenu.cpp:616 uml.cpp:424
-msgid "State Diagram..."
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
 msgstr ""
 
-#: listpopupmenu.cpp:617 uml.cpp:425
-msgid "Activity Diagram..."
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
 msgstr ""
 
-#: listpopupmenu.cpp:521 uml.cpp:426
-msgid "Component Diagram..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
 msgstr ""
 
-#: listpopupmenu.cpp:528 uml.cpp:427
-msgid "Deployment Diagram..."
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
 msgstr ""
 
-#: listpopupmenu.cpp:541 uml.cpp:428
-msgid "Entity Relationship Diagram..."
+#. 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 ""
 
-#: uml.cpp:458
-msgid "&Tree View"
-msgstr "Golwg &Coeden"
-
-#: uml.cpp:467
-msgid "&Documentation"
-msgstr "&Dogfenniaeth"
-
-#: uml.cpp:479 uml.cpp:664 uml.cpp:692
-msgid "Opening file..."
-msgstr "Agor ffeil..."
-
-#: uml.cpp:650
-msgid "Creating new document..."
-msgstr "Yn creu dogfen newydd..."
-
-#: 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"
+#: objectwidget.cpp:90
+msgid "Rename Object"
 msgstr ""
 
-#: uml.cpp:677
-msgid "Open File"
-msgstr "Agor Ffeil"
-
-#: uml.cpp:716
-msgid "Saving file..."
-msgstr "Yn cadw ffeil..."
-
-#: uml.cpp:727
-msgid "Saving file with a new filename..."
+#: objectwidget.cpp:91
+msgid "Enter object name:"
 msgstr ""
 
-#: uml.cpp:732
+#: umlwidgetcontroller.cpp:128
 msgid ""
-"*.xmi|XMI File\n"
-"*.xmi.tgz|Gzip Compressed XMI File\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
-"*|All Files"
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel move."
 msgstr ""
 
-#: uml.cpp:740
+#: umlwidgetcontroller.cpp:379
 msgid ""
-"The file %1 exists.\n"
-"Do you wish to overwrite it?"
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel resize."
 msgstr ""
 
-#: uml.cpp:740
-msgid "Overwrite"
-msgstr "Trosysgrifo"
-
-#: uml.cpp:764
-msgid "Closing file..."
-msgstr "Yn cau ffeil..."
-
-#: uml.cpp:772
-msgid "Printing..."
-msgstr "Argraffu..."
-
-#: uml.cpp:779
+#: umlviewimageexportermodel.cpp:126
 #, c-format
-msgid "Print %1"
-msgstr "Argraffu %1"
-
-#: uml.cpp:787
-msgid "Exiting..."
-msgstr "Terfynu..."
-
-#: uml.cpp:823
-msgid "Cutting selection..."
-msgstr "Yn torri'r dewisiad..."
-
-#: uml.cpp:836
-msgid "Copying selection to clipboard..."
-msgstr "Yn copïo'r dewisiad i'r clipfwrdd..."
-
-#: uml.cpp:844
-msgid "Inserting clipboard contents..."
-msgstr "Yn mewnosod cynnwys y clipfwrdd..."
-
-#: 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 ""
-
-#: clipboard/umlclipboard.cpp:691 uml.cpp:851
-msgid "Paste Error"
-msgstr ""
-
-#: uml.cpp:863
-msgid "Toggling toolbar..."
-msgstr "Dangos/cuddio'r bar offer..."
-
-#: uml.cpp:878
-msgid "Toggle the statusbar..."
-msgstr "Dangos/cuddio'r bar cyflwr..."
-
-#: uml.cpp:1186
-msgid "Cannot view code until you generate some first."
-msgstr ""
-
-#: uml.cpp:1186 uml.cpp:1189
-msgid "Cannot View Code"
-msgstr ""
-
-#: uml.cpp:1189
-msgid "Cannot view code from simple code writer."
-msgstr ""
-
-#: uml.cpp:1387
-msgid "*.idl|IDL Files (*.idl)"
-msgstr ""
-
-#: uml.cpp:1389
-msgid "*.py|Python Files (*.py)"
-msgstr ""
-
-#: uml.cpp:1391
-msgid "*.java|Java Files (*.java)"
-msgstr ""
-
-#: uml.cpp:1393
-msgid "*.pas|Pascal Files (*.pas)"
-msgstr ""
-
-#: uml.cpp:1395
-msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
+msgid "Can not create directory: %1"
 msgstr ""
 
-#: uml.cpp:1397
-msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
 msgstr ""
 
-#: uml.cpp:1399
-msgid "All Files"
-msgstr "Pob Ffeil"
-
-#: uml.cpp:1401
-msgid "Select Code to Import"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
 
 #. i18n: file umbrelloui.rc line 5
@@ -3269,269 +3298,72 @@ msgstr ""
 msgid "Role Visibility"
 msgstr ""
 
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr ""
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr ""
-
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr ""
-
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr ""
-
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr ""
-
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr ""
-
-#: listpopupmenu.cpp:695 stereotype.cpp:76
-msgid "Stereotype"
-msgstr ""
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr ""
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr ""
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr ""
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr ""
-
-#: umlview.cpp:2578
-#, fuzzy
-msgid "Enter Diagram Name"
-msgstr "Rhowch enw:"
-
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr ""
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr ""
-
-#: objectwidget.cpp:90
-msgid "Rename Object"
-msgstr ""
-
-#: objectwidget.cpp:91
-msgid "Enter object name:"
-msgstr ""
-
-#: 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 ""
-
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr ""
-
-#: tips.cpp:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-
-#: tips.cpp:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-
-#: tips.cpp:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-
-#: tips.cpp:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-
-#: tips.cpp:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-
-#: tips.cpp:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
+#: association.cpp:84
+msgid "Generalization"
 msgstr ""
 
-#: tips.cpp:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
+#: association.cpp:88
+msgid "Self Association"
 msgstr ""
 
-#: tips.cpp:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
+#: association.cpp:89
+msgid "Collaboration Message"
 msgstr ""
 
-#: tips.cpp:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
+#: association.cpp:90
+msgid "Sequence Message"
 msgstr ""
 
-#: tips.cpp:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
+#: association.cpp:91
+msgid "Collaboration Self Message"
 msgstr ""
 
-#: tips.cpp:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
+#: association.cpp:92
+msgid "Sequence Self Message"
 msgstr ""
 
-#: tips.cpp:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+#: association.cpp:95
+msgid "Realization"
 msgstr ""
 
-#: tips.cpp:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: association.cpp:96
+msgid "Uni Association"
 msgstr ""
 
-#: tips.cpp:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+#: statewidget.cpp:176
+msgid "Enter Activity"
 msgstr ""
 
-#: tips.cpp:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Dewisiadau Cyffredinol"
 
-#: tips.cpp:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
 msgstr ""
 
-#: tips.cpp:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
 msgstr ""
 
-#: tips.cpp:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
 msgstr ""
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
 msgstr ""
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
 msgstr ""
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
 msgstr ""
 
-#: operation.cpp:185
-msgid "new_parameter"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
 msgstr ""
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
@@ -3602,11 +3434,11 @@ msgid "Change State Name..."
 msgstr ""
 
 #: listpopupmenu.cpp:376
-msgid "Flip Horizontal"
+msgid "FlipQt::Horizontal"
 msgstr ""
 
 #: listpopupmenu.cpp:378
-msgid "Flip Vertical"
+msgid "FlipQt::Vertical"
 msgstr ""
 
 #: listpopupmenu.cpp:388
@@ -3835,6 +3667,175 @@ msgstr "Snapio i'r Grid"
 msgid "Show Grid"
 msgstr "Dangos Grid"
 
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr ""
+
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr ""
+
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr ""
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr ""
+
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr ""
+
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr ""
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr ""
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "GWALL"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Newid y Testun"
+
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr ""
+
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr ""
+
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr ""
+
+#: main.cpp:32 main.cpp:93
+msgid "Umbrello UML Modeller"
+msgstr ""
+
+#: main.cpp:40
+msgid "File to open"
+msgstr "Ffeil i agor"
+
+#: main.cpp:41
+msgid "export diagrams to extension and exit"
+msgstr ""
+
+#: 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 ""
+
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr ""
+
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr ""
+
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr ""
+
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr ""
+
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr ""
+
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr ""
+
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr ""
+
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr ""
+
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr ""
+
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr ""
+
+#: model_utils.cpp:264
+#, fuzzy
+msgid "new_folder"
+msgstr "plygell"
+
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr ""
+
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Gwag"
+
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr ""
+
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr ""
+
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr ""
+
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr ""
+
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr ""
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr ""
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr ""
+
 #~ msgid "Enables/disables the toolbar"
 #~ msgstr "Galluogi/analluogi'r bar offer"
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2014-09-29 03:08:03 -0500
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2014-09-29 03:08:03 -0500
commit	242434109c14a494dee7738b9c343f5947d20506 (patch)
tree	ea25930767128361a7669f1a25a479a66ccdfbeb /tde-i18n-cy/messages/tdesdk
parent	8819501c6a160b7ae106b1a968bc953b0f0bc465 (diff)
download	tde-i18n-242434109c14a494dee7738b9c343f5947d20506.tar.gz tde-i18n-242434109c14a494dee7738b9c343f5947d20506.zip